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 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 smtp.lore.kernel.org (Postfix) with ESMTPS id EFCADEB64DD for ; Mon, 14 Aug 2023 10:17:46 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 0067F10E196; Mon, 14 Aug 2023 10:17:46 +0000 (UTC) Received: from perceval.ideasonboard.com (perceval.ideasonboard.com [213.167.242.64]) by gabe.freedesktop.org (Postfix) with ESMTPS id 6055C10E196 for ; Mon, 14 Aug 2023 10:17:44 +0000 (UTC) Received: from pendragon.ideasonboard.com (213-243-189-158.bb.dnainternet.fi [213.243.189.158]) by perceval.ideasonboard.com (Postfix) with ESMTPSA id 8254F6BE; Mon, 14 Aug 2023 12:16:31 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=ideasonboard.com; s=mail; t=1692008191; bh=+tNL4NQA0CoBOCXHjja5RO3urDrFcvaNCJTMS8guwcY=; h=Date:From:To:Cc:Subject:References:In-Reply-To:From; b=EzctgWqnagqN8IGEy/u7xkW4p3ki+DpVeJoONsRnBXdloH6uhY0XlmAeUJsz2Q8Bh YZRNvFlGcKEb4l8vk58h71jwZ4NLrFcofw4jMPUz9zcB1WUMYiocfErE5pcXRWBSYZ kEIRuihUgGsvTYMr7HAjpdl0oo8jAEfgmJPmLaFs= Date: Mon, 14 Aug 2023 13:17:50 +0300 From: Laurent Pinchart To: Sam Ravnborg Subject: Re: [PATCH 11/11] drm/bridge: tc358768: Add DRM_BRIDGE_ATTACH_NO_CONNECTOR support Message-ID: <20230814101750.GA5723@pendragon.ideasonboard.com> References: <20230804-tc358768-v1-0-1afd44b7826b@ideasonboard.com> <20230804-tc358768-v1-11-1afd44b7826b@ideasonboard.com> <0855d804-3ba3-4f29-32b1-bab3b999e506@ideasonboard.com> <20230814101041.GA277347@ravnborg.org> MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Disposition: inline In-Reply-To: <20230814101041.GA277347@ravnborg.org> 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: Neil Armstrong , Robert Foss , Aradhya Bhatia , Jonas Karlman , Tomi Valkeinen , linux-kernel@vger.kernel.org, Jernej Skrabec , =?utf-8?B?UMOpdGVy?= Ujfalusi , Thierry Reding , dri-devel@lists.freedesktop.org, Andrzej Hajda , Maxim Schwalm , Dmitry Osipenko , Francesco Dolcini Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" On Mon, Aug 14, 2023 at 12:10:41PM +0200, Sam Ravnborg wrote: > > From c13c691bd8826b978325575be9a87f577b83b86b Mon Sep 17 00:00:00 2001 > > From: Tomi Valkeinen > > Date: Mon, 14 Aug 2023 13:02:23 +0300 > > Subject: [PATCH] drm/bridge: tc358768: fix 'Add DRM_BRIDGE_ATTACH_NO_CONNECTOR > > support' > > > > Signed-off-by: Tomi Valkeinen > > --- > > drivers/gpu/drm/bridge/tc358768.c | 56 +++++++++++++------------------ > > 1 file changed, 24 insertions(+), 32 deletions(-) > > > > diff --git a/drivers/gpu/drm/bridge/tc358768.c b/drivers/gpu/drm/bridge/tc358768.c > > index 82ea4d9a814a..9705ce1bd028 100644 > > --- a/drivers/gpu/drm/bridge/tc358768.c > > +++ b/drivers/gpu/drm/bridge/tc358768.c > > @@ -455,8 +455,6 @@ static int tc358768_dsi_host_detach(struct mipi_dsi_host *host, > > struct tc358768_priv *priv = dsi_host_to_tc358768(host); > > > > drm_bridge_remove(&priv->bridge); > > - if (priv->output.panel) > > - drm_panel_bridge_remove(priv->output.next_bridge); > > > > return 0; > > } > > @@ -531,49 +529,42 @@ static int tc358768_bridge_attach(struct drm_bridge *bridge, > > enum drm_bridge_attach_flags flags) > > { > > struct tc358768_priv *priv = bridge_to_tc358768(bridge); > > + struct drm_bridge *next_bridge; > > + struct drm_panel *panel; > > + int ret; > > > > if (!drm_core_check_feature(bridge->dev, DRIVER_ATOMIC)) { > > dev_err(priv->dev, "needs atomic updates support\n"); > > return -ENOTSUPP; > > } > > > > - if (flags & DRM_BRIDGE_ATTACH_NO_CONNECTOR) { > > - struct device_node *node; > > - > > - /* Get the next bridge, connected to port@1. */ > > - node = of_graph_get_remote_node(priv->dev->of_node, 1, -1); > > - if (!node) > > - return -ENODEV; > > - > > - priv->output.next_bridge = of_drm_find_bridge(node); > > - of_node_put(node); > > - if (!priv->output.next_bridge) > > - return -EPROBE_DEFER; > > - } else { > > - struct drm_bridge *bridge; > > - struct drm_panel *panel; > > - int ret; > > - > > - ret = drm_of_find_panel_or_bridge(priv->dev->of_node, 1, 0, > > - &panel, &bridge); > > - if (ret) > > - return ret; > > - > > - if (panel) { > > - bridge = drm_panel_bridge_add_typed(panel, > > - DRM_MODE_CONNECTOR_DSI); > > - if (IS_ERR(bridge)) > > - return PTR_ERR(bridge); > > - } > > + ret = drm_of_find_panel_or_bridge(priv->dev->of_node, 1, -1, &panel, > > + &next_bridge); > > I think the right way is to wrap the panel in a bridge, > so something like: > > next_bridge = devm_drm_of_get_bridge(dev, priv->dev->of_node, 1, -1) > > if (IS_ERR(next_bridge)) > return ... > priv->output.next_bridge = next_bridge; Should we at some point bite the bullet and wrap panels in bridges directly in drm_panel.c ? That would simplify all the consumers. > > + if (ret) > > + return ret; > > > > - priv->output.next_bridge = bridge; > > - priv->output.panel = panel; > > + if (panel) { > > + next_bridge = drm_panel_bridge_add_typed(panel, > > + DRM_MODE_CONNECTOR_DSI); > > + if (IS_ERR(next_bridge)) > > + return PTR_ERR(next_bridge); > > } > > > > + priv->output.next_bridge = next_bridge; > > + priv->output.panel = panel; > > + > > return drm_bridge_attach(bridge->encoder, priv->output.next_bridge, bridge, > > flags); > > } > > > > +void tc358768_bridge_detach(struct drm_bridge *bridge) > > +{ > > + struct tc358768_priv *priv = bridge_to_tc358768(bridge); > > + > > + if (priv->output.panel) > > + drm_panel_bridge_remove(priv->output.next_bridge); > > +} > > + > > static enum drm_mode_status > > tc358768_bridge_mode_valid(struct drm_bridge *bridge, > > const struct drm_display_info *info, > > @@ -1156,6 +1147,7 @@ tc358768_atomic_get_input_bus_fmts(struct drm_bridge *bridge, > > > > static const struct drm_bridge_funcs tc358768_bridge_funcs = { > > .attach = tc358768_bridge_attach, > > + .detach = tc358768_bridge_detach, > > .mode_valid = tc358768_bridge_mode_valid, > > .pre_enable = tc358768_bridge_pre_enable, > > .enable = tc358768_bridge_enable, -- Regards, Laurent Pinchart 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 Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 64D82EB64DD for ; Mon, 14 Aug 2023 10:18:56 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S233880AbjHNKS0 (ORCPT ); Mon, 14 Aug 2023 06:18:26 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:56130 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S236941AbjHNKST (ORCPT ); Mon, 14 Aug 2023 06:18:19 -0400 Received: from perceval.ideasonboard.com (perceval.ideasonboard.com [213.167.242.64]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 373A9173B for ; Mon, 14 Aug 2023 03:17:51 -0700 (PDT) Received: from pendragon.ideasonboard.com (213-243-189-158.bb.dnainternet.fi [213.243.189.158]) by perceval.ideasonboard.com (Postfix) with ESMTPSA id 8254F6BE; Mon, 14 Aug 2023 12:16:31 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=ideasonboard.com; s=mail; t=1692008191; bh=+tNL4NQA0CoBOCXHjja5RO3urDrFcvaNCJTMS8guwcY=; h=Date:From:To:Cc:Subject:References:In-Reply-To:From; b=EzctgWqnagqN8IGEy/u7xkW4p3ki+DpVeJoONsRnBXdloH6uhY0XlmAeUJsz2Q8Bh YZRNvFlGcKEb4l8vk58h71jwZ4NLrFcofw4jMPUz9zcB1WUMYiocfErE5pcXRWBSYZ kEIRuihUgGsvTYMr7HAjpdl0oo8jAEfgmJPmLaFs= Date: Mon, 14 Aug 2023 13:17:50 +0300 From: Laurent Pinchart To: Sam Ravnborg Cc: Tomi Valkeinen , Maxim Schwalm , Andrzej Hajda , Neil Armstrong , Robert Foss , Jonas Karlman , Jernej Skrabec , David Airlie , Daniel Vetter , =?utf-8?B?UMOpdGVy?= Ujfalusi , Francesco Dolcini , Dmitry Osipenko , Thierry Reding , linux-kernel@vger.kernel.org, dri-devel@lists.freedesktop.org, Aradhya Bhatia Subject: Re: [PATCH 11/11] drm/bridge: tc358768: Add DRM_BRIDGE_ATTACH_NO_CONNECTOR support Message-ID: <20230814101750.GA5723@pendragon.ideasonboard.com> References: <20230804-tc358768-v1-0-1afd44b7826b@ideasonboard.com> <20230804-tc358768-v1-11-1afd44b7826b@ideasonboard.com> <0855d804-3ba3-4f29-32b1-bab3b999e506@ideasonboard.com> <20230814101041.GA277347@ravnborg.org> MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Disposition: inline In-Reply-To: <20230814101041.GA277347@ravnborg.org> Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On Mon, Aug 14, 2023 at 12:10:41PM +0200, Sam Ravnborg wrote: > > From c13c691bd8826b978325575be9a87f577b83b86b Mon Sep 17 00:00:00 2001 > > From: Tomi Valkeinen > > Date: Mon, 14 Aug 2023 13:02:23 +0300 > > Subject: [PATCH] drm/bridge: tc358768: fix 'Add DRM_BRIDGE_ATTACH_NO_CONNECTOR > > support' > > > > Signed-off-by: Tomi Valkeinen > > --- > > drivers/gpu/drm/bridge/tc358768.c | 56 +++++++++++++------------------ > > 1 file changed, 24 insertions(+), 32 deletions(-) > > > > diff --git a/drivers/gpu/drm/bridge/tc358768.c b/drivers/gpu/drm/bridge/tc358768.c > > index 82ea4d9a814a..9705ce1bd028 100644 > > --- a/drivers/gpu/drm/bridge/tc358768.c > > +++ b/drivers/gpu/drm/bridge/tc358768.c > > @@ -455,8 +455,6 @@ static int tc358768_dsi_host_detach(struct mipi_dsi_host *host, > > struct tc358768_priv *priv = dsi_host_to_tc358768(host); > > > > drm_bridge_remove(&priv->bridge); > > - if (priv->output.panel) > > - drm_panel_bridge_remove(priv->output.next_bridge); > > > > return 0; > > } > > @@ -531,49 +529,42 @@ static int tc358768_bridge_attach(struct drm_bridge *bridge, > > enum drm_bridge_attach_flags flags) > > { > > struct tc358768_priv *priv = bridge_to_tc358768(bridge); > > + struct drm_bridge *next_bridge; > > + struct drm_panel *panel; > > + int ret; > > > > if (!drm_core_check_feature(bridge->dev, DRIVER_ATOMIC)) { > > dev_err(priv->dev, "needs atomic updates support\n"); > > return -ENOTSUPP; > > } > > > > - if (flags & DRM_BRIDGE_ATTACH_NO_CONNECTOR) { > > - struct device_node *node; > > - > > - /* Get the next bridge, connected to port@1. */ > > - node = of_graph_get_remote_node(priv->dev->of_node, 1, -1); > > - if (!node) > > - return -ENODEV; > > - > > - priv->output.next_bridge = of_drm_find_bridge(node); > > - of_node_put(node); > > - if (!priv->output.next_bridge) > > - return -EPROBE_DEFER; > > - } else { > > - struct drm_bridge *bridge; > > - struct drm_panel *panel; > > - int ret; > > - > > - ret = drm_of_find_panel_or_bridge(priv->dev->of_node, 1, 0, > > - &panel, &bridge); > > - if (ret) > > - return ret; > > - > > - if (panel) { > > - bridge = drm_panel_bridge_add_typed(panel, > > - DRM_MODE_CONNECTOR_DSI); > > - if (IS_ERR(bridge)) > > - return PTR_ERR(bridge); > > - } > > + ret = drm_of_find_panel_or_bridge(priv->dev->of_node, 1, -1, &panel, > > + &next_bridge); > > I think the right way is to wrap the panel in a bridge, > so something like: > > next_bridge = devm_drm_of_get_bridge(dev, priv->dev->of_node, 1, -1) > > if (IS_ERR(next_bridge)) > return ... > priv->output.next_bridge = next_bridge; Should we at some point bite the bullet and wrap panels in bridges directly in drm_panel.c ? That would simplify all the consumers. > > + if (ret) > > + return ret; > > > > - priv->output.next_bridge = bridge; > > - priv->output.panel = panel; > > + if (panel) { > > + next_bridge = drm_panel_bridge_add_typed(panel, > > + DRM_MODE_CONNECTOR_DSI); > > + if (IS_ERR(next_bridge)) > > + return PTR_ERR(next_bridge); > > } > > > > + priv->output.next_bridge = next_bridge; > > + priv->output.panel = panel; > > + > > return drm_bridge_attach(bridge->encoder, priv->output.next_bridge, bridge, > > flags); > > } > > > > +void tc358768_bridge_detach(struct drm_bridge *bridge) > > +{ > > + struct tc358768_priv *priv = bridge_to_tc358768(bridge); > > + > > + if (priv->output.panel) > > + drm_panel_bridge_remove(priv->output.next_bridge); > > +} > > + > > static enum drm_mode_status > > tc358768_bridge_mode_valid(struct drm_bridge *bridge, > > const struct drm_display_info *info, > > @@ -1156,6 +1147,7 @@ tc358768_atomic_get_input_bus_fmts(struct drm_bridge *bridge, > > > > static const struct drm_bridge_funcs tc358768_bridge_funcs = { > > .attach = tc358768_bridge_attach, > > + .detach = tc358768_bridge_detach, > > .mode_valid = tc358768_bridge_mode_valid, > > .pre_enable = tc358768_bridge_pre_enable, > > .enable = tc358768_bridge_enable, -- Regards, Laurent Pinchart