From patchwork Tue Apr 4 19:30:44 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Dhinakaran Pandiyan X-Patchwork-Id: 9664743 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id 7ABD360353 for ; Wed, 5 Apr 2017 16:58:22 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 6C02D2859E for ; Wed, 5 Apr 2017 16:58:22 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 61083285A1; Wed, 5 Apr 2017 16:58:22 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-4.2 required=2.0 tests=BAYES_00, RCVD_IN_DNSWL_MED autolearn=unavailable version=3.3.1 Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) (using TLSv1.2 with cipher DHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id 214232859E for ; Wed, 5 Apr 2017 16:58:22 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 18BDD6E83E; Wed, 5 Apr 2017 16:58:18 +0000 (UTC) X-Original-To: dri-devel@lists.freedesktop.org Delivered-To: dri-devel@lists.freedesktop.org Received: from mga05.intel.com (mga05.intel.com [192.55.52.43]) by gabe.freedesktop.org (Postfix) with ESMTPS id 173826E2D2; Tue, 4 Apr 2017 19:32:54 +0000 (UTC) Received: from orsmga001.jf.intel.com ([10.7.209.18]) by fmsmga105.fm.intel.com with ESMTP; 04 Apr 2017 12:32:53 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos; i="5.36,275,1486454400"; d="scan'208"; a="1115415843" Received: from nuc-skylake.jf.intel.com ([10.54.75.20]) by orsmga001.jf.intel.com with ESMTP; 04 Apr 2017 12:32:53 -0700 From: Dhinakaran Pandiyan To: intel-gfx@lists.freedesktop.org Subject: [PATCH v6 4/5] drm: Connector helper function to release resources Date: Tue, 4 Apr 2017 12:30:44 -0700 Message-Id: <1491334245-17194-4-git-send-email-dhinakaran.pandiyan@intel.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1491334245-17194-1-git-send-email-dhinakaran.pandiyan@intel.com> References: <7d2ff402-2b58-bc16-4b16-97b288ae387d@linux.intel.com> <1491334245-17194-1-git-send-email-dhinakaran.pandiyan@intel.com> X-Mailman-Approved-At: Wed, 05 Apr 2017 16:58:17 +0000 Cc: Daniel Vetter , dri-devel@lists.freedesktop.org, "Pandiyan, Dhinakaran" X-BeenThere: dri-devel@lists.freedesktop.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: Direct Rendering Infrastructure - Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" X-Virus-Scanned: ClamAV using ClamSMTP From: "Pandiyan, Dhinakaran" Having an ->atomic_release callback is useful to release shared resources that get allocated in compute_config(). This function is expected to be called in the atomic_check() phase before new resources are acquired. v5: Return an int (Maarten) v4: Document that the function is conditionally called and before other atomic_checks() (Daniel) v3: Use the new 'for_each_oldnew_connector_in_state()' macro. v2: Moved the caller hunk to this patch (Daniel) Cc: Daniel Vetter Cc: Maarten Lankhorst Cc: Archit Taneja Cc: Chris Wilson Cc: Harry Wentland Reviewed-by: Maarten Lankhorst Reviewed-by: Daniel Vetter Suggested-by: Daniel Vetter Signed-off-by: Dhinakaran Pandiyan --- drivers/gpu/drm/drm_atomic_helper.c | 22 ++++++++++++++++++++++ include/drm/drm_modeset_helper_vtables.h | 20 ++++++++++++++++++++ 2 files changed, 42 insertions(+) diff --git a/drivers/gpu/drm/drm_atomic_helper.c b/drivers/gpu/drm/drm_atomic_helper.c index d14094d..57d2e50 100644 --- a/drivers/gpu/drm/drm_atomic_helper.c +++ b/drivers/gpu/drm/drm_atomic_helper.c @@ -586,6 +586,28 @@ drm_atomic_helper_check_modeset(struct drm_device *dev, } } + for_each_oldnew_connector_in_state(state, connector, old_connector_state, new_connector_state, i) { + const struct drm_connector_helper_funcs *conn_funcs; + struct drm_crtc_state *crtc_state; + + conn_funcs = connector->helper_private; + if (!conn_funcs->atomic_release) + continue; + + if (!old_connector_state->crtc) + continue; + + crtc_state = drm_atomic_get_existing_crtc_state(state, old_connector_state->crtc); + + if (crtc_state->connectors_changed || + crtc_state->mode_changed || + (crtc_state->active_changed && !crtc_state->active)) { + ret = conn_funcs->atomic_release(connector, new_connector_state); + if (ret != 0) + return ret; + } + } + return mode_fixup(state); } EXPORT_SYMBOL(drm_atomic_helper_check_modeset); diff --git a/include/drm/drm_modeset_helper_vtables.h b/include/drm/drm_modeset_helper_vtables.h index 091c422..36a4b16 100644 --- a/include/drm/drm_modeset_helper_vtables.h +++ b/include/drm/drm_modeset_helper_vtables.h @@ -836,6 +836,26 @@ struct drm_connector_helper_funcs { */ struct drm_encoder *(*atomic_best_encoder)(struct drm_connector *connector, struct drm_connector_state *connector_state); + + /** + * @atomic_release: + * + * This function is conditionally called to release shared resources + * when the attached CRTC's mode changes or it's connectors change or + * becomes inactive. It is called before the corresponding + * &drm_crtc_helper_funcs.atomic_check or + * &drm_crtc_helper_funcs.mode_fixup hooks are called. + * + * NOTE: + * + * This function is called in the check phase of an atomic update. + * + * RETURNS: + * + * 0 on success or negative error codes on failure. + */ + int (*atomic_release)(struct drm_connector *connector, + struct drm_connector_state *connector_state); }; /**