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=-15.8 required=3.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER, INCLUDES_PATCH,MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED 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 098CEC433C1 for ; Wed, 24 Mar 2021 01:13:45 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id CC79C61934 for ; Wed, 24 Mar 2021 01:13:44 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S234108AbhCXBNK (ORCPT ); Tue, 23 Mar 2021 21:13:10 -0400 Received: from perceval.ideasonboard.com ([213.167.242.64]:49200 "EHLO perceval.ideasonboard.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230011AbhCXBMm (ORCPT ); Tue, 23 Mar 2021 21:12:42 -0400 Received: from pendragon.ideasonboard.com (62-78-145-57.bb.dnainternet.fi [62.78.145.57]) by perceval.ideasonboard.com (Postfix) with ESMTPSA id 6D570580; Wed, 24 Mar 2021 02:12:40 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=ideasonboard.com; s=mail; t=1616548360; bh=vuJ0DJ9qBEKJ/rNxZ8TfWwwC3KkXweg/inkaD3SvBis=; h=Date:From:To:Cc:Subject:References:In-Reply-To:From; b=l9u0FhdwnK7GE0kV+gqZ6kr1o5Sq808ZbOnOqFY0RCRXBISo7NsoT3pI48YDnbeAD GxHaY/n6LYJhtPUz9GHf+vGmk1X4s4Oi9PNDelNGEbHdThXXPCd5fngGAFyvhnD0LR fwtRzQHoE/oTWKWpGqieU103cK4dSwcfPCRFLo9w= Date: Wed, 24 Mar 2021 03:11:58 +0200 From: Laurent Pinchart To: Jagan Teki Cc: Maxime Ripard , Chen-Yu Tsai , Jernej Skrabec , Samuel Holland , dri-devel@lists.freedesktop.org, linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, linux-amarula@amarulasolutions.com, linux-sunxi@googlegroups.com Subject: Re: [PATCH v4 3/4] drm: sun4i: dsi: Convert to bridge driver Message-ID: References: <20210322140152.101709-1-jagan@amarulasolutions.com> <20210322140152.101709-4-jagan@amarulasolutions.com> MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Disposition: inline In-Reply-To: <20210322140152.101709-4-jagan@amarulasolutions.com> Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Hi Jagan, Thank you for the patch. On Mon, Mar 22, 2021 at 07:31:51PM +0530, Jagan Teki wrote: > DRM bridge drivers have build-in handling of treating all display > pipeline components as bridges. > > So, convert the existing to a drm bridge driver with a built-in > encoder support for compatibility with existing component drivers. It would be best if possible to move this patch before 2/4, to first convert to the bridge model, and then build on top of it. > Signed-off-by: Jagan Teki > --- > Changes for v4: > - none > Changes for v3: > - new patch > > drivers/gpu/drm/sun4i/sun6i_mipi_dsi.c | 75 ++++++++++++++++---------- > drivers/gpu/drm/sun4i/sun6i_mipi_dsi.h | 6 +++ > 2 files changed, 54 insertions(+), 27 deletions(-) > > diff --git a/drivers/gpu/drm/sun4i/sun6i_mipi_dsi.c b/drivers/gpu/drm/sun4i/sun6i_mipi_dsi.c > index 39321299dc27..6f3c5330a468 100644 > --- a/drivers/gpu/drm/sun4i/sun6i_mipi_dsi.c > +++ b/drivers/gpu/drm/sun4i/sun6i_mipi_dsi.c > @@ -714,10 +714,10 @@ static int sun6i_dsi_start(struct sun6i_dsi *dsi, > return 0; > } > > -static void sun6i_dsi_encoder_enable(struct drm_encoder *encoder) > +static void sun6i_dsi_bridge_enable(struct drm_bridge *bridge) > { > - struct drm_display_mode *mode = &encoder->crtc->state->adjusted_mode; > - struct sun6i_dsi *dsi = encoder_to_sun6i_dsi(encoder); > + struct drm_display_mode *mode = &bridge->encoder->crtc->state->adjusted_mode; > + struct sun6i_dsi *dsi = bridge_to_sun6i_dsi(bridge); > struct mipi_dsi_device *device = dsi->device; > union phy_configure_opts opts = { }; > struct phy_configure_opts_mipi_dphy *cfg = &opts.mipi_dphy; > @@ -801,9 +801,9 @@ static void sun6i_dsi_encoder_enable(struct drm_encoder *encoder) > sun6i_dsi_start(dsi, DSI_START_HSD); > } > > -static void sun6i_dsi_encoder_disable(struct drm_encoder *encoder) > +static void sun6i_dsi_bridge_disable(struct drm_bridge *bridge) > { > - struct sun6i_dsi *dsi = encoder_to_sun6i_dsi(encoder); > + struct sun6i_dsi *dsi = bridge_to_sun6i_dsi(bridge); > > DRM_DEBUG_DRIVER("Disabling DSI output\n"); > > @@ -852,9 +852,40 @@ static const struct drm_connector_funcs sun6i_dsi_connector_funcs = { > .atomic_destroy_state = drm_atomic_helper_connector_destroy_state, > }; > > -static const struct drm_encoder_helper_funcs sun6i_dsi_enc_helper_funcs = { > - .disable = sun6i_dsi_encoder_disable, > - .enable = sun6i_dsi_encoder_enable, > +static int sun6i_dsi_bridge_attach(struct drm_bridge *bridge, > + enum drm_bridge_attach_flags flags) > +{ > + struct sun6i_dsi *dsi = bridge_to_sun6i_dsi(bridge); > + int ret; > + > + if (dsi->panel_bridge) > + return drm_bridge_attach(bridge->encoder, dsi->panel_bridge, NULL, 0); > + > + if (dsi->panel) { > + drm_connector_helper_add(&dsi->connector, > + &sun6i_dsi_connector_helper_funcs); > + ret = drm_connector_init(bridge->dev, &dsi->connector, > + &sun6i_dsi_connector_funcs, > + DRM_MODE_CONNECTOR_DSI); > + if (ret) { > + dev_err(dsi->dev, "Couldn't initialise the DSI connector\n"); > + goto err_cleanup_connector; > + } > + > + drm_connector_attach_encoder(&dsi->connector, &dsi->encoder); > + } > + > + return 0; > + > +err_cleanup_connector: > + drm_encoder_cleanup(&dsi->encoder); > + return ret; > +} > + > +static const struct drm_bridge_funcs sun6i_dsi_bridge_funcs = { > + .enable = sun6i_dsi_bridge_enable, > + .disable = sun6i_dsi_bridge_disable, > + .attach = sun6i_dsi_bridge_attach, > }; > > static u32 sun6i_dsi_dcs_build_pkt_hdr(struct sun6i_dsi *dsi, > @@ -1063,8 +1094,6 @@ static int sun6i_dsi_bind(struct device *dev, struct device *master, > struct sun6i_dsi *dsi = dev_get_drvdata(dev); > int ret; > > - drm_encoder_helper_add(&dsi->encoder, > - &sun6i_dsi_enc_helper_funcs); > ret = drm_simple_encoder_init(drm, &dsi->encoder, > DRM_MODE_ENCODER_DSI); > if (ret) { > @@ -1073,27 +1102,12 @@ static int sun6i_dsi_bind(struct device *dev, struct device *master, > } > dsi->encoder.possible_crtcs = BIT(0); > > - drm_connector_helper_add(&dsi->connector, > - &sun6i_dsi_connector_helper_funcs); > - ret = drm_connector_init(drm, &dsi->connector, > - &sun6i_dsi_connector_funcs, > - DRM_MODE_CONNECTOR_DSI); > + ret = drm_bridge_attach(&dsi->encoder, &dsi->bridge, NULL, 0); > if (ret) { > - dev_err(dsi->dev, > - "Couldn't initialise the DSI connector\n"); > + dev_err(dsi->dev, "Couldn't attach drm bridge\n"); > goto err_cleanup_connector; > } > > - drm_connector_attach_encoder(&dsi->connector, &dsi->encoder); > - > - if (dsi->panel_bridge) { > - ret = drm_bridge_attach(&dsi->encoder, dsi->panel_bridge, NULL, 0); > - if (ret) { > - dev_err(dsi->dev, "Couldn't attach drm bridge\n"); > - goto err_cleanup_connector; > - } > - } > - > return 0; > > err_cleanup_connector: > @@ -1199,6 +1213,12 @@ static int sun6i_dsi_probe(struct platform_device *pdev) > goto err_unprotect_clk; > } > > + dsi->bridge.funcs = &sun6i_dsi_bridge_funcs; > + dsi->bridge.of_node = dev->of_node; > + dsi->bridge.type = DRM_MODE_CONNECTOR_DSI; > + > + drm_bridge_add(&dsi->bridge); > + > ret = component_add(&pdev->dev, &sun6i_dsi_ops); > if (ret) { > dev_err(dev, "Couldn't register our component\n"); > @@ -1222,6 +1242,7 @@ static int sun6i_dsi_remove(struct platform_device *pdev) > struct device *dev = &pdev->dev; > struct sun6i_dsi *dsi = dev_get_drvdata(dev); > > + drm_bridge_remove(&dsi->bridge); > component_del(&pdev->dev, &sun6i_dsi_ops); > mipi_dsi_host_unregister(&dsi->host); > clk_rate_exclusive_put(dsi->mod_clk); > diff --git a/drivers/gpu/drm/sun4i/sun6i_mipi_dsi.h b/drivers/gpu/drm/sun4i/sun6i_mipi_dsi.h > index 370ecb356a63..5e70666089ad 100644 > --- a/drivers/gpu/drm/sun4i/sun6i_mipi_dsi.h > +++ b/drivers/gpu/drm/sun4i/sun6i_mipi_dsi.h > @@ -16,6 +16,7 @@ > #define SUN6I_DSI_TCON_DIV 4 > > struct sun6i_dsi { > + struct drm_bridge bridge; > struct drm_connector connector; > struct drm_encoder encoder; The drm_encoder should be dropped from this driver, the encoder should be created by the main display driver. > struct mipi_dsi_host host; > @@ -38,6 +39,11 @@ static inline struct sun6i_dsi *host_to_sun6i_dsi(struct mipi_dsi_host *host) > return container_of(host, struct sun6i_dsi, host); > }; > > +static inline struct sun6i_dsi *bridge_to_sun6i_dsi(struct drm_bridge *bridge) > +{ > + return container_of(bridge, struct sun6i_dsi, bridge); > +} > + > static inline struct sun6i_dsi *connector_to_sun6i_dsi(struct drm_connector *connector) > { > return container_of(connector, struct sun6i_dsi, connector); -- 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 X-Spam-Level: X-Spam-Status: No, score=-14.0 required=3.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER, INCLUDES_PATCH,MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED 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 8F4B8C433DB for ; Wed, 24 Mar 2021 01:14:28 +0000 (UTC) Received: from desiato.infradead.org (desiato.infradead.org [90.155.92.199]) (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 2B2A0619CC for ; Wed, 24 Mar 2021 01:14:28 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 2B2A0619CC Authentication-Results: mail.kernel.org; dmarc=none (p=none dis=none) header.from=ideasonboard.com Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=desiato.20200630; h=Sender:Content-Transfer-Encoding :Content-Type:List-Subscribe:List-Help:List-Post:List-Archive: List-Unsubscribe:List-Id:In-Reply-To:MIME-Version:References:Message-ID: Subject:Cc:To:From:Date:Reply-To:Content-ID:Content-Description:Resent-Date: Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:List-Owner; bh=HdW+rDQtHRW0BqBMSV0FP8T5bxx9q+7iu4UcWMU5sj0=; b=AAzOVQhJxXu3U7PvksyptmZw/ k0fH7jqI3SHCCG3TGv+c5/uoo9/yBsTUDAN58GuNr6IImCiNa6ntOj0bTPj/yKH7V3z+xjxcebz52 sbemDuGy/MjBirwFsbgeo/oUbcaeJnMB4Li0Dyk1/PezHCBJyn+ObCGEUX8i3EiC+0QAgK2g9zGbA ILqDEwTMFxiFnD9vb+U8IwcQz7QOIF01Ch21Q2w723pDqtwIHj4JsYdf+SCeL8I339ucyW9JEzvZK 6BA8A0U3vC7cDf+c+VQSyN01a1x8fxa7h57agYn+KCxE+lAqdGWcOppRYGTZKGMs8klRk2GBMrwav PkbMvAf9g==; Received: from localhost ([::1] helo=desiato.infradead.org) by desiato.infradead.org with esmtp (Exim 4.94 #2 (Red Hat Linux)) id 1lOs4l-00G3zS-N1; Wed, 24 Mar 2021 01:12:47 +0000 Received: from perceval.ideasonboard.com ([2001:4b98:dc2:55:216:3eff:fef7:d647]) by desiato.infradead.org with esmtps (Exim 4.94 #2 (Red Hat Linux)) id 1lOs4g-00G3yn-67 for linux-arm-kernel@lists.infradead.org; Wed, 24 Mar 2021 01:12:44 +0000 Received: from pendragon.ideasonboard.com (62-78-145-57.bb.dnainternet.fi [62.78.145.57]) by perceval.ideasonboard.com (Postfix) with ESMTPSA id 6D570580; Wed, 24 Mar 2021 02:12:40 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=ideasonboard.com; s=mail; t=1616548360; bh=vuJ0DJ9qBEKJ/rNxZ8TfWwwC3KkXweg/inkaD3SvBis=; h=Date:From:To:Cc:Subject:References:In-Reply-To:From; b=l9u0FhdwnK7GE0kV+gqZ6kr1o5Sq808ZbOnOqFY0RCRXBISo7NsoT3pI48YDnbeAD GxHaY/n6LYJhtPUz9GHf+vGmk1X4s4Oi9PNDelNGEbHdThXXPCd5fngGAFyvhnD0LR fwtRzQHoE/oTWKWpGqieU103cK4dSwcfPCRFLo9w= Date: Wed, 24 Mar 2021 03:11:58 +0200 From: Laurent Pinchart To: Jagan Teki Cc: Maxime Ripard , Chen-Yu Tsai , Jernej Skrabec , Samuel Holland , dri-devel@lists.freedesktop.org, linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, linux-amarula@amarulasolutions.com, linux-sunxi@googlegroups.com Subject: Re: [PATCH v4 3/4] drm: sun4i: dsi: Convert to bridge driver Message-ID: References: <20210322140152.101709-1-jagan@amarulasolutions.com> <20210322140152.101709-4-jagan@amarulasolutions.com> MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: <20210322140152.101709-4-jagan@amarulasolutions.com> X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20210324_011242_407615_E1DD80F7 X-CRM114-Status: GOOD ( 29.68 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org Hi Jagan, Thank you for the patch. On Mon, Mar 22, 2021 at 07:31:51PM +0530, Jagan Teki wrote: > DRM bridge drivers have build-in handling of treating all display > pipeline components as bridges. > > So, convert the existing to a drm bridge driver with a built-in > encoder support for compatibility with existing component drivers. It would be best if possible to move this patch before 2/4, to first convert to the bridge model, and then build on top of it. > Signed-off-by: Jagan Teki > --- > Changes for v4: > - none > Changes for v3: > - new patch > > drivers/gpu/drm/sun4i/sun6i_mipi_dsi.c | 75 ++++++++++++++++---------- > drivers/gpu/drm/sun4i/sun6i_mipi_dsi.h | 6 +++ > 2 files changed, 54 insertions(+), 27 deletions(-) > > diff --git a/drivers/gpu/drm/sun4i/sun6i_mipi_dsi.c b/drivers/gpu/drm/sun4i/sun6i_mipi_dsi.c > index 39321299dc27..6f3c5330a468 100644 > --- a/drivers/gpu/drm/sun4i/sun6i_mipi_dsi.c > +++ b/drivers/gpu/drm/sun4i/sun6i_mipi_dsi.c > @@ -714,10 +714,10 @@ static int sun6i_dsi_start(struct sun6i_dsi *dsi, > return 0; > } > > -static void sun6i_dsi_encoder_enable(struct drm_encoder *encoder) > +static void sun6i_dsi_bridge_enable(struct drm_bridge *bridge) > { > - struct drm_display_mode *mode = &encoder->crtc->state->adjusted_mode; > - struct sun6i_dsi *dsi = encoder_to_sun6i_dsi(encoder); > + struct drm_display_mode *mode = &bridge->encoder->crtc->state->adjusted_mode; > + struct sun6i_dsi *dsi = bridge_to_sun6i_dsi(bridge); > struct mipi_dsi_device *device = dsi->device; > union phy_configure_opts opts = { }; > struct phy_configure_opts_mipi_dphy *cfg = &opts.mipi_dphy; > @@ -801,9 +801,9 @@ static void sun6i_dsi_encoder_enable(struct drm_encoder *encoder) > sun6i_dsi_start(dsi, DSI_START_HSD); > } > > -static void sun6i_dsi_encoder_disable(struct drm_encoder *encoder) > +static void sun6i_dsi_bridge_disable(struct drm_bridge *bridge) > { > - struct sun6i_dsi *dsi = encoder_to_sun6i_dsi(encoder); > + struct sun6i_dsi *dsi = bridge_to_sun6i_dsi(bridge); > > DRM_DEBUG_DRIVER("Disabling DSI output\n"); > > @@ -852,9 +852,40 @@ static const struct drm_connector_funcs sun6i_dsi_connector_funcs = { > .atomic_destroy_state = drm_atomic_helper_connector_destroy_state, > }; > > -static const struct drm_encoder_helper_funcs sun6i_dsi_enc_helper_funcs = { > - .disable = sun6i_dsi_encoder_disable, > - .enable = sun6i_dsi_encoder_enable, > +static int sun6i_dsi_bridge_attach(struct drm_bridge *bridge, > + enum drm_bridge_attach_flags flags) > +{ > + struct sun6i_dsi *dsi = bridge_to_sun6i_dsi(bridge); > + int ret; > + > + if (dsi->panel_bridge) > + return drm_bridge_attach(bridge->encoder, dsi->panel_bridge, NULL, 0); > + > + if (dsi->panel) { > + drm_connector_helper_add(&dsi->connector, > + &sun6i_dsi_connector_helper_funcs); > + ret = drm_connector_init(bridge->dev, &dsi->connector, > + &sun6i_dsi_connector_funcs, > + DRM_MODE_CONNECTOR_DSI); > + if (ret) { > + dev_err(dsi->dev, "Couldn't initialise the DSI connector\n"); > + goto err_cleanup_connector; > + } > + > + drm_connector_attach_encoder(&dsi->connector, &dsi->encoder); > + } > + > + return 0; > + > +err_cleanup_connector: > + drm_encoder_cleanup(&dsi->encoder); > + return ret; > +} > + > +static const struct drm_bridge_funcs sun6i_dsi_bridge_funcs = { > + .enable = sun6i_dsi_bridge_enable, > + .disable = sun6i_dsi_bridge_disable, > + .attach = sun6i_dsi_bridge_attach, > }; > > static u32 sun6i_dsi_dcs_build_pkt_hdr(struct sun6i_dsi *dsi, > @@ -1063,8 +1094,6 @@ static int sun6i_dsi_bind(struct device *dev, struct device *master, > struct sun6i_dsi *dsi = dev_get_drvdata(dev); > int ret; > > - drm_encoder_helper_add(&dsi->encoder, > - &sun6i_dsi_enc_helper_funcs); > ret = drm_simple_encoder_init(drm, &dsi->encoder, > DRM_MODE_ENCODER_DSI); > if (ret) { > @@ -1073,27 +1102,12 @@ static int sun6i_dsi_bind(struct device *dev, struct device *master, > } > dsi->encoder.possible_crtcs = BIT(0); > > - drm_connector_helper_add(&dsi->connector, > - &sun6i_dsi_connector_helper_funcs); > - ret = drm_connector_init(drm, &dsi->connector, > - &sun6i_dsi_connector_funcs, > - DRM_MODE_CONNECTOR_DSI); > + ret = drm_bridge_attach(&dsi->encoder, &dsi->bridge, NULL, 0); > if (ret) { > - dev_err(dsi->dev, > - "Couldn't initialise the DSI connector\n"); > + dev_err(dsi->dev, "Couldn't attach drm bridge\n"); > goto err_cleanup_connector; > } > > - drm_connector_attach_encoder(&dsi->connector, &dsi->encoder); > - > - if (dsi->panel_bridge) { > - ret = drm_bridge_attach(&dsi->encoder, dsi->panel_bridge, NULL, 0); > - if (ret) { > - dev_err(dsi->dev, "Couldn't attach drm bridge\n"); > - goto err_cleanup_connector; > - } > - } > - > return 0; > > err_cleanup_connector: > @@ -1199,6 +1213,12 @@ static int sun6i_dsi_probe(struct platform_device *pdev) > goto err_unprotect_clk; > } > > + dsi->bridge.funcs = &sun6i_dsi_bridge_funcs; > + dsi->bridge.of_node = dev->of_node; > + dsi->bridge.type = DRM_MODE_CONNECTOR_DSI; > + > + drm_bridge_add(&dsi->bridge); > + > ret = component_add(&pdev->dev, &sun6i_dsi_ops); > if (ret) { > dev_err(dev, "Couldn't register our component\n"); > @@ -1222,6 +1242,7 @@ static int sun6i_dsi_remove(struct platform_device *pdev) > struct device *dev = &pdev->dev; > struct sun6i_dsi *dsi = dev_get_drvdata(dev); > > + drm_bridge_remove(&dsi->bridge); > component_del(&pdev->dev, &sun6i_dsi_ops); > mipi_dsi_host_unregister(&dsi->host); > clk_rate_exclusive_put(dsi->mod_clk); > diff --git a/drivers/gpu/drm/sun4i/sun6i_mipi_dsi.h b/drivers/gpu/drm/sun4i/sun6i_mipi_dsi.h > index 370ecb356a63..5e70666089ad 100644 > --- a/drivers/gpu/drm/sun4i/sun6i_mipi_dsi.h > +++ b/drivers/gpu/drm/sun4i/sun6i_mipi_dsi.h > @@ -16,6 +16,7 @@ > #define SUN6I_DSI_TCON_DIV 4 > > struct sun6i_dsi { > + struct drm_bridge bridge; > struct drm_connector connector; > struct drm_encoder encoder; The drm_encoder should be dropped from this driver, the encoder should be created by the main display driver. > struct mipi_dsi_host host; > @@ -38,6 +39,11 @@ static inline struct sun6i_dsi *host_to_sun6i_dsi(struct mipi_dsi_host *host) > return container_of(host, struct sun6i_dsi, host); > }; > > +static inline struct sun6i_dsi *bridge_to_sun6i_dsi(struct drm_bridge *bridge) > +{ > + return container_of(bridge, struct sun6i_dsi, bridge); > +} > + > static inline struct sun6i_dsi *connector_to_sun6i_dsi(struct drm_connector *connector) > { > return container_of(connector, struct sun6i_dsi, connector); -- Regards, Laurent Pinchart _______________________________________________ linux-arm-kernel mailing list linux-arm-kernel@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-arm-kernel 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=-13.6 required=3.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED 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 4DE2FC433C1 for ; Wed, 24 Mar 2021 01:12: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 EAAD9619E7 for ; Wed, 24 Mar 2021 01:12:44 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org EAAD9619E7 Authentication-Results: mail.kernel.org; dmarc=none (p=none dis=none) header.from=ideasonboard.com 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 44F9989D5F; Wed, 24 Mar 2021 01:12:44 +0000 (UTC) Received: from perceval.ideasonboard.com (perceval.ideasonboard.com [IPv6:2001:4b98:dc2:55:216:3eff:fef7:d647]) by gabe.freedesktop.org (Postfix) with ESMTPS id 8797889D5F for ; Wed, 24 Mar 2021 01:12:42 +0000 (UTC) Received: from pendragon.ideasonboard.com (62-78-145-57.bb.dnainternet.fi [62.78.145.57]) by perceval.ideasonboard.com (Postfix) with ESMTPSA id 6D570580; Wed, 24 Mar 2021 02:12:40 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=ideasonboard.com; s=mail; t=1616548360; bh=vuJ0DJ9qBEKJ/rNxZ8TfWwwC3KkXweg/inkaD3SvBis=; h=Date:From:To:Cc:Subject:References:In-Reply-To:From; b=l9u0FhdwnK7GE0kV+gqZ6kr1o5Sq808ZbOnOqFY0RCRXBISo7NsoT3pI48YDnbeAD GxHaY/n6LYJhtPUz9GHf+vGmk1X4s4Oi9PNDelNGEbHdThXXPCd5fngGAFyvhnD0LR fwtRzQHoE/oTWKWpGqieU103cK4dSwcfPCRFLo9w= Date: Wed, 24 Mar 2021 03:11:58 +0200 From: Laurent Pinchart To: Jagan Teki Subject: Re: [PATCH v4 3/4] drm: sun4i: dsi: Convert to bridge driver Message-ID: References: <20210322140152.101709-1-jagan@amarulasolutions.com> <20210322140152.101709-4-jagan@amarulasolutions.com> MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: <20210322140152.101709-4-jagan@amarulasolutions.com> 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 , Samuel Holland , linux-sunxi@googlegroups.com, linux-kernel@vger.kernel.org, dri-devel@lists.freedesktop.org, Chen-Yu Tsai , linux-amarula@amarulasolutions.com, linux-arm-kernel@lists.infradead.org Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" Hi Jagan, Thank you for the patch. On Mon, Mar 22, 2021 at 07:31:51PM +0530, Jagan Teki wrote: > DRM bridge drivers have build-in handling of treating all display > pipeline components as bridges. > > So, convert the existing to a drm bridge driver with a built-in > encoder support for compatibility with existing component drivers. It would be best if possible to move this patch before 2/4, to first convert to the bridge model, and then build on top of it. > Signed-off-by: Jagan Teki > --- > Changes for v4: > - none > Changes for v3: > - new patch > > drivers/gpu/drm/sun4i/sun6i_mipi_dsi.c | 75 ++++++++++++++++---------- > drivers/gpu/drm/sun4i/sun6i_mipi_dsi.h | 6 +++ > 2 files changed, 54 insertions(+), 27 deletions(-) > > diff --git a/drivers/gpu/drm/sun4i/sun6i_mipi_dsi.c b/drivers/gpu/drm/sun4i/sun6i_mipi_dsi.c > index 39321299dc27..6f3c5330a468 100644 > --- a/drivers/gpu/drm/sun4i/sun6i_mipi_dsi.c > +++ b/drivers/gpu/drm/sun4i/sun6i_mipi_dsi.c > @@ -714,10 +714,10 @@ static int sun6i_dsi_start(struct sun6i_dsi *dsi, > return 0; > } > > -static void sun6i_dsi_encoder_enable(struct drm_encoder *encoder) > +static void sun6i_dsi_bridge_enable(struct drm_bridge *bridge) > { > - struct drm_display_mode *mode = &encoder->crtc->state->adjusted_mode; > - struct sun6i_dsi *dsi = encoder_to_sun6i_dsi(encoder); > + struct drm_display_mode *mode = &bridge->encoder->crtc->state->adjusted_mode; > + struct sun6i_dsi *dsi = bridge_to_sun6i_dsi(bridge); > struct mipi_dsi_device *device = dsi->device; > union phy_configure_opts opts = { }; > struct phy_configure_opts_mipi_dphy *cfg = &opts.mipi_dphy; > @@ -801,9 +801,9 @@ static void sun6i_dsi_encoder_enable(struct drm_encoder *encoder) > sun6i_dsi_start(dsi, DSI_START_HSD); > } > > -static void sun6i_dsi_encoder_disable(struct drm_encoder *encoder) > +static void sun6i_dsi_bridge_disable(struct drm_bridge *bridge) > { > - struct sun6i_dsi *dsi = encoder_to_sun6i_dsi(encoder); > + struct sun6i_dsi *dsi = bridge_to_sun6i_dsi(bridge); > > DRM_DEBUG_DRIVER("Disabling DSI output\n"); > > @@ -852,9 +852,40 @@ static const struct drm_connector_funcs sun6i_dsi_connector_funcs = { > .atomic_destroy_state = drm_atomic_helper_connector_destroy_state, > }; > > -static const struct drm_encoder_helper_funcs sun6i_dsi_enc_helper_funcs = { > - .disable = sun6i_dsi_encoder_disable, > - .enable = sun6i_dsi_encoder_enable, > +static int sun6i_dsi_bridge_attach(struct drm_bridge *bridge, > + enum drm_bridge_attach_flags flags) > +{ > + struct sun6i_dsi *dsi = bridge_to_sun6i_dsi(bridge); > + int ret; > + > + if (dsi->panel_bridge) > + return drm_bridge_attach(bridge->encoder, dsi->panel_bridge, NULL, 0); > + > + if (dsi->panel) { > + drm_connector_helper_add(&dsi->connector, > + &sun6i_dsi_connector_helper_funcs); > + ret = drm_connector_init(bridge->dev, &dsi->connector, > + &sun6i_dsi_connector_funcs, > + DRM_MODE_CONNECTOR_DSI); > + if (ret) { > + dev_err(dsi->dev, "Couldn't initialise the DSI connector\n"); > + goto err_cleanup_connector; > + } > + > + drm_connector_attach_encoder(&dsi->connector, &dsi->encoder); > + } > + > + return 0; > + > +err_cleanup_connector: > + drm_encoder_cleanup(&dsi->encoder); > + return ret; > +} > + > +static const struct drm_bridge_funcs sun6i_dsi_bridge_funcs = { > + .enable = sun6i_dsi_bridge_enable, > + .disable = sun6i_dsi_bridge_disable, > + .attach = sun6i_dsi_bridge_attach, > }; > > static u32 sun6i_dsi_dcs_build_pkt_hdr(struct sun6i_dsi *dsi, > @@ -1063,8 +1094,6 @@ static int sun6i_dsi_bind(struct device *dev, struct device *master, > struct sun6i_dsi *dsi = dev_get_drvdata(dev); > int ret; > > - drm_encoder_helper_add(&dsi->encoder, > - &sun6i_dsi_enc_helper_funcs); > ret = drm_simple_encoder_init(drm, &dsi->encoder, > DRM_MODE_ENCODER_DSI); > if (ret) { > @@ -1073,27 +1102,12 @@ static int sun6i_dsi_bind(struct device *dev, struct device *master, > } > dsi->encoder.possible_crtcs = BIT(0); > > - drm_connector_helper_add(&dsi->connector, > - &sun6i_dsi_connector_helper_funcs); > - ret = drm_connector_init(drm, &dsi->connector, > - &sun6i_dsi_connector_funcs, > - DRM_MODE_CONNECTOR_DSI); > + ret = drm_bridge_attach(&dsi->encoder, &dsi->bridge, NULL, 0); > if (ret) { > - dev_err(dsi->dev, > - "Couldn't initialise the DSI connector\n"); > + dev_err(dsi->dev, "Couldn't attach drm bridge\n"); > goto err_cleanup_connector; > } > > - drm_connector_attach_encoder(&dsi->connector, &dsi->encoder); > - > - if (dsi->panel_bridge) { > - ret = drm_bridge_attach(&dsi->encoder, dsi->panel_bridge, NULL, 0); > - if (ret) { > - dev_err(dsi->dev, "Couldn't attach drm bridge\n"); > - goto err_cleanup_connector; > - } > - } > - > return 0; > > err_cleanup_connector: > @@ -1199,6 +1213,12 @@ static int sun6i_dsi_probe(struct platform_device *pdev) > goto err_unprotect_clk; > } > > + dsi->bridge.funcs = &sun6i_dsi_bridge_funcs; > + dsi->bridge.of_node = dev->of_node; > + dsi->bridge.type = DRM_MODE_CONNECTOR_DSI; > + > + drm_bridge_add(&dsi->bridge); > + > ret = component_add(&pdev->dev, &sun6i_dsi_ops); > if (ret) { > dev_err(dev, "Couldn't register our component\n"); > @@ -1222,6 +1242,7 @@ static int sun6i_dsi_remove(struct platform_device *pdev) > struct device *dev = &pdev->dev; > struct sun6i_dsi *dsi = dev_get_drvdata(dev); > > + drm_bridge_remove(&dsi->bridge); > component_del(&pdev->dev, &sun6i_dsi_ops); > mipi_dsi_host_unregister(&dsi->host); > clk_rate_exclusive_put(dsi->mod_clk); > diff --git a/drivers/gpu/drm/sun4i/sun6i_mipi_dsi.h b/drivers/gpu/drm/sun4i/sun6i_mipi_dsi.h > index 370ecb356a63..5e70666089ad 100644 > --- a/drivers/gpu/drm/sun4i/sun6i_mipi_dsi.h > +++ b/drivers/gpu/drm/sun4i/sun6i_mipi_dsi.h > @@ -16,6 +16,7 @@ > #define SUN6I_DSI_TCON_DIV 4 > > struct sun6i_dsi { > + struct drm_bridge bridge; > struct drm_connector connector; > struct drm_encoder encoder; The drm_encoder should be dropped from this driver, the encoder should be created by the main display driver. > struct mipi_dsi_host host; > @@ -38,6 +39,11 @@ static inline struct sun6i_dsi *host_to_sun6i_dsi(struct mipi_dsi_host *host) > return container_of(host, struct sun6i_dsi, host); > }; > > +static inline struct sun6i_dsi *bridge_to_sun6i_dsi(struct drm_bridge *bridge) > +{ > + return container_of(bridge, struct sun6i_dsi, bridge); > +} > + > static inline struct sun6i_dsi *connector_to_sun6i_dsi(struct drm_connector *connector) > { > return container_of(connector, struct sun6i_dsi, connector); -- Regards, Laurent Pinchart _______________________________________________ dri-devel mailing list dri-devel@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/dri-devel