From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-8.2 required=3.0 tests=HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS, USER_AGENT_SANE_1 autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 53D56C54FCB for ; Sat, 25 Apr 2020 17:02:45 +0000 (UTC) Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 30FBC206B6 for ; Sat, 25 Apr 2020 17:02:45 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 30FBC206B6 Authentication-Results: mail.kernel.org; dmarc=none (p=none dis=none) header.from=ravnborg.org Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=dri-devel-bounces@lists.freedesktop.org Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 958F16E0F3; Sat, 25 Apr 2020 17:02:44 +0000 (UTC) Received: from asavdk3.altibox.net (asavdk3.altibox.net [109.247.116.14]) by gabe.freedesktop.org (Postfix) with ESMTPS id 01CE96E0F3 for ; Sat, 25 Apr 2020 17:02:42 +0000 (UTC) Received: from ravnborg.org (unknown [158.248.194.18]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by asavdk3.altibox.net (Postfix) with ESMTPS id D03B820023; Sat, 25 Apr 2020 19:02:38 +0200 (CEST) Date: Sat, 25 Apr 2020 19:02:37 +0200 From: Sam Ravnborg To: Dmitry Osipenko Subject: Re: [PATCH v5 6/6] drm/tegra: output: rgb: Wrap directly-connected panel into DRM bridge Message-ID: <20200425170237.GA20498@ravnborg.org> References: <20200418170703.1583-1-digetx@gmail.com> <20200418170703.1583-7-digetx@gmail.com> MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: <20200418170703.1583-7-digetx@gmail.com> User-Agent: Mutt/1.10.1 (2018-07-13) X-CMAE-Score: 0 X-CMAE-Analysis: v=2.3 cv=ULXz4hXy c=1 sm=1 tr=0 a=UWs3HLbX/2nnQ3s7vZ42gw==:117 a=UWs3HLbX/2nnQ3s7vZ42gw==:17 a=kj9zAlcOel0A:10 a=P1BnusSwAAAA:8 a=pGLkceISAAAA:8 a=7gkXJVJtAAAA:8 a=e5mUnYsNAAAA:8 a=V0GYCF9GdKgsJ-jD5OsA:9 a=CjuIK1q_8ugA:10 a=D0XLA9XvdZm18NrgonBM:22 a=E9Po1WZjFZOl8hwRPBS3:22 a=Vxmtnl_E_bksehYqCbjh:22 X-BeenThere: dri-devel@lists.freedesktop.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Direct Rendering Infrastructure - Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: devicetree@vger.kernel.org, dri-devel@lists.freedesktop.org, linux-kernel@vger.kernel.org, Rob Herring , Thierry Reding , Laurent Pinchart , linux-tegra@vger.kernel.org, Frank Rowand Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" Hi Dmitry On Sat, Apr 18, 2020 at 08:07:03PM +0300, Dmitry Osipenko wrote: > Currently Tegra DRM driver manually manages display panel, but this > management could be moved out into DRM core if we'll wrap panel into > DRM bridge. This patch wraps RGB panel into a DRM bridge and removes > manual handling of the panel from the RGB output code. > > Suggested-by: Laurent Pinchart > Signed-off-by: Dmitry Osipenko This resulted in the expected simplifications - good. Acked-by: Sam Ravnborg > --- > drivers/gpu/drm/tegra/rgb.c | 53 +++++++++++++------------------------ > 1 file changed, 18 insertions(+), 35 deletions(-) > > diff --git a/drivers/gpu/drm/tegra/rgb.c b/drivers/gpu/drm/tegra/rgb.c > index 9a7024ec96bc..a4c5a6066c54 100644 > --- a/drivers/gpu/drm/tegra/rgb.c > +++ b/drivers/gpu/drm/tegra/rgb.c > @@ -8,7 +8,6 @@ > > #include > #include > -#include > #include > > #include "drm.h" > @@ -86,15 +85,6 @@ static void tegra_dc_write_regs(struct tegra_dc *dc, > tegra_dc_writel(dc, table[i].value, table[i].offset); > } > > -static const struct drm_connector_funcs tegra_rgb_connector_funcs = { > - .reset = drm_atomic_helper_connector_reset, > - .detect = tegra_output_connector_detect, > - .fill_modes = drm_helper_probe_single_connector_modes, > - .destroy = tegra_output_connector_destroy, > - .atomic_duplicate_state = drm_atomic_helper_connector_duplicate_state, > - .atomic_destroy_state = drm_atomic_helper_connector_destroy_state, > -}; > - > static enum drm_mode_status > tegra_rgb_connector_mode_valid(struct drm_connector *connector, > struct drm_display_mode *mode) > @@ -117,14 +107,8 @@ static void tegra_rgb_encoder_disable(struct drm_encoder *encoder) > struct tegra_output *output = encoder_to_output(encoder); > struct tegra_rgb *rgb = to_rgb(output); > > - if (output->panel) > - drm_panel_disable(output->panel); > - > tegra_dc_write_regs(rgb->dc, rgb_disable, ARRAY_SIZE(rgb_disable)); > tegra_dc_commit(rgb->dc); > - > - if (output->panel) > - drm_panel_unprepare(output->panel); > } > > static void tegra_rgb_encoder_enable(struct drm_encoder *encoder) > @@ -133,9 +117,6 @@ static void tegra_rgb_encoder_enable(struct drm_encoder *encoder) > struct tegra_rgb *rgb = to_rgb(output); > u32 value; > > - if (output->panel) > - drm_panel_prepare(output->panel); > - > tegra_dc_write_regs(rgb->dc, rgb_enable, ARRAY_SIZE(rgb_enable)); > > value = DE_SELECT_ACTIVE | DE_CONTROL_NORMAL; > @@ -157,9 +138,6 @@ static void tegra_rgb_encoder_enable(struct drm_encoder *encoder) > tegra_dc_writel(rgb->dc, value, DC_DISP_SHIFT_CLOCK_OPTIONS); > > tegra_dc_commit(rgb->dc); > - > - if (output->panel) > - drm_panel_enable(output->panel); > } > > static int > @@ -278,6 +256,23 @@ int tegra_dc_rgb_init(struct drm_device *drm, struct tegra_dc *dc) > drm_encoder_helper_add(&output->encoder, > &tegra_rgb_encoder_helper_funcs); > > + /* > + * Wrap directly-connected panel into DRM bridge in order to let > + * DRM core to handle panel for us. > + */ > + if (output->panel) { > + output->bridge = devm_drm_panel_bridge_add(output->dev, > + output->panel); > + if (IS_ERR(output->bridge)) { > + dev_err(output->dev, > + "failed to wrap panel into bridge: %pe\n", > + output->bridge); > + return PTR_ERR(output->bridge); > + } > + > + output->panel = NULL; > + } > + > /* > * Tegra devices that have LVDS panel utilize LVDS encoder bridge > * for converting up to 28 LCD LVTTL lanes into 5/4 LVDS lanes that > @@ -292,8 +287,7 @@ int tegra_dc_rgb_init(struct drm_device *drm, struct tegra_dc *dc) > * Newer device-trees utilize LVDS encoder bridge, which provides > * us with a connector and handles the display panel. > * > - * For older device-trees we fall back to our own connector and use > - * nvidia,panel phandle. > + * For older device-trees we wrapped panel into the panel-bridge. > */ > if (output->bridge) { > err = drm_bridge_attach(&output->encoder, output->bridge, > @@ -313,17 +307,6 @@ int tegra_dc_rgb_init(struct drm_device *drm, struct tegra_dc *dc) > } > > drm_connector_attach_encoder(connector, &output->encoder); > - } else { > - drm_connector_init(drm, &output->connector, > - &tegra_rgb_connector_funcs, > - DRM_MODE_CONNECTOR_LVDS); > - drm_connector_helper_add(&output->connector, > - &tegra_rgb_connector_helper_funcs); > - output->connector.dpms = DRM_MODE_DPMS_OFF; > - > - drm_connector_attach_encoder(&output->connector, > - &output->encoder); > - drm_connector_register(&output->connector); > } > > err = tegra_output_init(drm, output); > -- > 2.26.0 > > _______________________________________________ > dri-devel mailing list > dri-devel@lists.freedesktop.org > https://lists.freedesktop.org/mailman/listinfo/dri-devel _______________________________________________ dri-devel mailing list dri-devel@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/dri-devel