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=-10.0 required=3.0 tests=BAYES_00, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_HELO_NONE,SPF_PASS autolearn=unavailable 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 2D483C433E0 for ; Sun, 19 Jul 2020 13:07:05 +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 0378020809 for ; Sun, 19 Jul 2020 13:07:04 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 0378020809 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 552176E0A0; Sun, 19 Jul 2020 13:07:04 +0000 (UTC) Received: from asavdk4.altibox.net (asavdk4.altibox.net [109.247.116.15]) by gabe.freedesktop.org (Postfix) with ESMTPS id BD5826E065 for ; Sun, 19 Jul 2020 13:07:02 +0000 (UTC) Received: from ravnborg.org (unknown [188.228.123.71]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by asavdk4.altibox.net (Postfix) with ESMTPS id 549B080511; Sun, 19 Jul 2020 15:06:58 +0200 (CEST) Date: Sun, 19 Jul 2020 15:06:56 +0200 From: Sam Ravnborg To: Laurent Pinchart Subject: Re: [PATCH v3 06/21] drm/bridge: tc358767: add drm_panel_bridge support Message-ID: <20200719130656.GB31024@ravnborg.org> References: <20200703192417.372164-1-sam@ravnborg.org> <20200703192417.372164-7-sam@ravnborg.org> <20200710221935.GJ5964@pendragon.ideasonboard.com> MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: <20200710221935.GJ5964@pendragon.ideasonboard.com> X-CMAE-Score: 0 X-CMAE-Analysis: v=2.3 cv=aP3eV41m c=1 sm=1 tr=0 a=S6zTFyMACwkrwXSdXUNehg==:117 a=S6zTFyMACwkrwXSdXUNehg==:17 a=kj9zAlcOel0A:10 a=7gkXJVJtAAAA:8 a=hD80L64hAAAA:8 a=IpJZQVW2AAAA:8 a=P1BnusSwAAAA:8 a=RwHePtW7AAAA:8 a=e5mUnYsNAAAA:8 a=N4x6fHONVFxJnwInMYUA:9 a=CjuIK1q_8ugA:10 a=E9Po1WZjFZOl8hwRPBS3:22 a=IawgGOuG5U0WyFbmm1f5:22 a=D0XLA9XvdZm18NrgonBM:22 a=FqraQwd7dyEg5dwJgZJs: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: Jernej Skrabec , kbuild test robot , Neil Armstrong , Peter Senna Tschudin , dri-devel@lists.freedesktop.org, Andrzej Hajda , Jonas Karlman , Thierry Reding , Martyn Welch Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" Hi Laurent. On Sat, Jul 11, 2020 at 01:19:35AM +0300, Laurent Pinchart wrote: > Hi Sam, > > Thank you for the patch. > > On Fri, Jul 03, 2020 at 09:24:02PM +0200, Sam Ravnborg wrote: > > Prepare the bridge driver for use in a chained setup by > > replacing direct use of drm_panel with drm_panel_bridge support. > > > > The bridge driver assume the panel is optional. > > The relevant tests are migrated over to check for the > > pnale bridge to keep the same functionality. > > s/pnale/panel/ > > > Note: the bridge panel will use the connector type from the panel. > > > > Signed-off-by: Sam Ravnborg > > Cc: Andrzej Hajda > > Cc: Neil Armstrong > > Cc: Laurent Pinchart > > Cc: Jonas Karlman > > Cc: Jernej Skrabec > > --- > > drivers/gpu/drm/bridge/tc358767.c | 57 +++++++++++++++---------------- > > 1 file changed, 27 insertions(+), 30 deletions(-) > > > > diff --git a/drivers/gpu/drm/bridge/tc358767.c b/drivers/gpu/drm/bridge/tc358767.c > > index c2777b226c75..08d483664258 100644 > > --- a/drivers/gpu/drm/bridge/tc358767.c > > +++ b/drivers/gpu/drm/bridge/tc358767.c > > @@ -244,8 +244,8 @@ struct tc_data { > > struct drm_dp_aux aux; > > > > struct drm_bridge bridge; > > + struct drm_bridge *panel_bridge; > > struct drm_connector connector; > > - struct drm_panel *panel; > > > > /* link settings */ > > struct tc_edp_link link; > > @@ -1236,13 +1236,6 @@ static int tc_stream_disable(struct tc_data *tc) > > return 0; > > } > > > > -static void tc_bridge_pre_enable(struct drm_bridge *bridge) > > -{ > > - struct tc_data *tc = bridge_to_tc(bridge); > > - > > - drm_panel_prepare(tc->panel); > > -} > > - > > static void tc_bridge_enable(struct drm_bridge *bridge) > > { > > struct tc_data *tc = bridge_to_tc(bridge); > > @@ -1266,8 +1259,6 @@ static void tc_bridge_enable(struct drm_bridge *bridge) > > tc_main_link_disable(tc); > > return; > > } > > - > > - drm_panel_enable(tc->panel); > > } > > > > static void tc_bridge_disable(struct drm_bridge *bridge) > > @@ -1275,8 +1266,6 @@ static void tc_bridge_disable(struct drm_bridge *bridge) > > struct tc_data *tc = bridge_to_tc(bridge); > > int ret; > > > > - drm_panel_disable(tc->panel); > > - > > ret = tc_stream_disable(tc); > > if (ret < 0) > > dev_err(tc->dev, "main link stream stop error: %d\n", ret); > > @@ -1286,13 +1275,6 @@ static void tc_bridge_disable(struct drm_bridge *bridge) > > dev_err(tc->dev, "main link disable error: %d\n", ret); > > } > > > > -static void tc_bridge_post_disable(struct drm_bridge *bridge) > > -{ > > - struct tc_data *tc = bridge_to_tc(bridge); > > - > > - drm_panel_unprepare(tc->panel); > > -} > > - > > static bool tc_bridge_mode_fixup(struct drm_bridge *bridge, > > const struct drm_display_mode *mode, > > struct drm_display_mode *adj) > > @@ -1348,9 +1330,11 @@ static int tc_connector_get_modes(struct drm_connector *connector) > > return 0; > > } > > > > - count = drm_panel_get_modes(tc->panel, connector); > > - if (count > 0) > > - return count; > > + if (tc->panel_bridge) { > > + count = drm_bridge_get_modes(tc->panel_bridge, connector); > > + if (count > 0) > > + return count; > > + } > > > > edid = drm_get_edid(connector, &tc->aux.ddc); > > > > @@ -1378,7 +1362,7 @@ static enum drm_connector_status tc_connector_detect(struct drm_connector *conne > > int ret; > > > > if (tc->hpd_pin < 0) { > > - if (tc->panel) > > + if (tc->panel_bridge) > > return connector_status_connected; > > else > > return connector_status_unknown; > > @@ -1413,6 +1397,13 @@ static int tc_bridge_attach(struct drm_bridge *bridge, > > struct drm_device *drm = bridge->dev; > > int ret; > > > > + if (tc->panel_bridge) { > > + ret = drm_bridge_attach(tc->bridge.encoder, tc->panel_bridge, > > + &tc->bridge, flags); > > + if (ret < 0) > > + return ret; > > + } > > With this both this driver and the panel bridge driver will create a > connector. The simplest way to handle that is probably to pass > flags & ~DRM_BRIDGE_ATTACH_NO_CONNECTOR to drm_bridge_attach(). It's a > bit of a hack, but should go away once all users are converted to > !DRM_BRIDGE_ATTACH_NO_CONNECTOR. I do not follow you here - sorry. We have two situations: display driver creates the connector - and passes DRM_BRIDGE_ATTACH_NO_CONNECTOR. - bridge driver shall not create connector - bridge panel shall not create connector display driver expect bridge to create connector and passes 0 - bridge driver shall not create connector - bridge panel shall create connector So the correct logic seems to be: - if there is a bridge panel do not create a connector in the bridge - otherwise just follow the flags I will try to implement this. Sam > > Reviewed-by: Laurent Pinchart > > > + > > if (flags & DRM_BRIDGE_ATTACH_NO_CONNECTOR) { > > DRM_ERROR("Fix bridge driver to make connector optional!"); > > return -EINVAL; > > @@ -1421,7 +1412,7 @@ static int tc_bridge_attach(struct drm_bridge *bridge, > > /* Create DP/eDP connector */ > > drm_connector_helper_add(&tc->connector, &tc_connector_helper_funcs); > > ret = drm_connector_init(drm, &tc->connector, &tc_connector_funcs, > > - tc->panel ? DRM_MODE_CONNECTOR_eDP : > > + tc->panel_bridge ? DRM_MODE_CONNECTOR_eDP : > > DRM_MODE_CONNECTOR_DisplayPort); > > if (ret) > > return ret; > > @@ -1435,9 +1426,6 @@ static int tc_bridge_attach(struct drm_bridge *bridge, > > DRM_CONNECTOR_POLL_DISCONNECT; > > } > > > > - if (tc->panel) > > - drm_panel_attach(tc->panel, &tc->connector); > > - > > drm_display_info_set_bus_formats(&tc->connector.display_info, > > &bus_format, 1); > > tc->connector.display_info.bus_flags = > > @@ -1453,10 +1441,8 @@ static const struct drm_bridge_funcs tc_bridge_funcs = { > > .attach = tc_bridge_attach, > > .mode_valid = tc_mode_valid, > > .mode_set = tc_bridge_mode_set, > > - .pre_enable = tc_bridge_pre_enable, > > .enable = tc_bridge_enable, > > .disable = tc_bridge_disable, > > - .post_disable = tc_bridge_post_disable, > > .mode_fixup = tc_bridge_mode_fixup, > > }; > > > > @@ -1547,6 +1533,7 @@ static irqreturn_t tc_irq_handler(int irq, void *arg) > > static int tc_probe(struct i2c_client *client, const struct i2c_device_id *id) > > { > > struct device *dev = &client->dev; > > + struct drm_panel *panel; > > struct tc_data *tc; > > int ret; > > > > @@ -1557,10 +1544,20 @@ static int tc_probe(struct i2c_client *client, const struct i2c_device_id *id) > > tc->dev = dev; > > > > /* port@2 is the output port */ > > - ret = drm_of_find_panel_or_bridge(dev->of_node, 2, 0, &tc->panel, NULL); > > + ret = drm_of_find_panel_or_bridge(dev->of_node, 2, 0, &panel, NULL); > > if (ret && ret != -ENODEV) > > return ret; > > > > + if (panel) { > > + struct drm_bridge *pbridge; > > + > > + pbridge = devm_drm_panel_bridge_add(dev, panel); > > + if (IS_ERR(pbridge)) > > + return PTR_ERR(pbridge); > > + > > + tc->panel_bridge = pbridge; > > + } > > + > > /* Shut down GPIO is optional */ > > tc->sd_gpio = devm_gpiod_get_optional(dev, "shutdown", GPIOD_OUT_HIGH); > > if (IS_ERR(tc->sd_gpio)) > > -- > Regards, > > Laurent Pinchart > _______________________________________________ > 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