From patchwork Thu Jun 2 14:31:47 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Boris BREZILLON X-Patchwork-Id: 9150223 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 2D97860221 for ; Thu, 2 Jun 2016 14:32:35 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 1EF1528294 for ; Thu, 2 Jun 2016 14:32:35 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 1365428303; Thu, 2 Jun 2016 14:32:35 +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=-3.2 required=2.0 tests=BAYES_00,FSL_HELO_HOME, RCVD_IN_DNSWL_MED autolearn=ham version=3.3.1 Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id C6C9128294 for ; Thu, 2 Jun 2016 14:32:34 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id DFE776EBDB; Thu, 2 Jun 2016 14:32:33 +0000 (UTC) X-Original-To: intel-gfx@lists.freedesktop.org Delivered-To: intel-gfx@lists.freedesktop.org Received: from mail.free-electrons.com (down.free-electrons.com [37.187.137.238]) by gabe.freedesktop.org (Postfix) with ESMTP id 93BBC6EBE5; Thu, 2 Jun 2016 14:32:21 +0000 (UTC) Received: by mail.free-electrons.com (Postfix, from userid 110) id 76F321B0C; Thu, 2 Jun 2016 16:32:20 +0200 (CEST) Received: from bbrezillon.home (LStLambert-657-1-97-87.w90-63.abo.wanadoo.fr [90.63.216.87]) by mail.free-electrons.com (Postfix) with ESMTPSA id 70076B50; Thu, 2 Jun 2016 16:32:09 +0200 (CEST) From: Boris Brezillon To: David Airlie , Daniel Vetter , dri-devel@lists.freedesktop.org, Daniel Vetter Date: Thu, 2 Jun 2016 16:31:47 +0200 Message-Id: <1464877907-27723-21-git-send-email-boris.brezillon@free-electrons.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1464877907-27723-1-git-send-email-boris.brezillon@free-electrons.com> References: <1464877907-27723-1-git-send-email-boris.brezillon@free-electrons.com> Cc: Krzysztof Kozlowski , Heiko Stuebner , Stefan Agner , virtualization@lists.linux-foundation.org, Thierry Reding , Laurent Pinchart , Benjamin Gaignard , Alexandre Courbot , linux-samsung-soc@vger.kernel.org, Joonyoung Shim , Boris Brezillon , Alexey Brodkin , Kyungmin Park , linux-rockchip@lists.infradead.org, Chen-Yu Tsai , Kukjin Kim , linux-tegra@vger.kernel.org, Stephen Warren , linux-arm-msm@vger.kernel.org, intel-gfx@lists.freedesktop.org, Inki Dae , linux-mediatek@lists.infradead.org, Matthias Brugger , Vincent Abriou , linux-arm-kernel@lists.infradead.org, Mark Yao , Alison Wang , Seung-Woo Kim , linux-kernel@vger.kernel.org, linux-renesas-soc@vger.kernel.org, Maxime Ripard , freedreno@lists.freedesktop.org, Gerd Hoffmann Subject: [Intel-gfx] [PATCH 20/20] drm/bridge: dw-hdmi: Use drm_atomic_helper_best_encoder() X-BeenThere: intel-gfx@lists.freedesktop.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: Intel graphics driver community testing & development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: intel-gfx-bounces@lists.freedesktop.org Sender: "Intel-gfx" X-Virus-Scanned: ClamAV using ClamSMTP We have a 1:1 relationship between connectors and encoders, which means we can rely on the drm_atomic_helper_best_encoder() behavior. We still have to explicitly assign ->best_encoder() to drm_atomic_helper_best_encoder(), because the automated fallback to drm_atomic_helper_best_encoder() when ->best_encoder() is NULL is only available when the DRM device is using the atomic helpers, and this bridge is compatible with non-atomic and atomic devices. Signed-off-by: Boris Brezillon --- drivers/gpu/drm/bridge/dw-hdmi.c | 11 +---------- 1 file changed, 1 insertion(+), 10 deletions(-) diff --git a/drivers/gpu/drm/bridge/dw-hdmi.c b/drivers/gpu/drm/bridge/dw-hdmi.c index c9d9412..70b1f7d 100644 --- a/drivers/gpu/drm/bridge/dw-hdmi.c +++ b/drivers/gpu/drm/bridge/dw-hdmi.c @@ -1476,15 +1476,6 @@ dw_hdmi_connector_mode_valid(struct drm_connector *connector, return mode_status; } -static struct drm_encoder *dw_hdmi_connector_best_encoder(struct drm_connector - *connector) -{ - struct dw_hdmi *hdmi = container_of(connector, struct dw_hdmi, - connector); - - return hdmi->encoder; -} - static void dw_hdmi_connector_destroy(struct drm_connector *connector) { drm_connector_unregister(connector); @@ -1525,7 +1516,7 @@ static const struct drm_connector_funcs dw_hdmi_atomic_connector_funcs = { static const struct drm_connector_helper_funcs dw_hdmi_connector_helper_funcs = { .get_modes = dw_hdmi_connector_get_modes, .mode_valid = dw_hdmi_connector_mode_valid, - .best_encoder = dw_hdmi_connector_best_encoder, + .best_encoder = drm_atomic_helper_best_encoder, }; static const struct drm_bridge_funcs dw_hdmi_bridge_funcs = {