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.5 required=3.0 tests=HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS, URIBL_BLOCKED,USER_AGENT_SANE_2 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 D7690C433DF for ; Wed, 1 Jul 2020 11:52:01 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id B067120663 for ; Wed, 1 Jul 2020 11:52:01 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1730435AbgGALwA (ORCPT ); Wed, 1 Jul 2020 07:52:00 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:54422 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1730349AbgGALv7 (ORCPT ); Wed, 1 Jul 2020 07:51:59 -0400 Received: from bhuna.collabora.co.uk (bhuna.collabora.co.uk [IPv6:2a00:1098:0:82:1000:25:2eeb:e3e3]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id A5AF4C061755 for ; Wed, 1 Jul 2020 04:51:59 -0700 (PDT) Received: from localhost (unknown [IPv6:2a01:e0a:2c:6930:5cf4:84a1:2763:fe0d]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) (Authenticated sender: bbrezillon) by bhuna.collabora.co.uk (Postfix) with ESMTPSA id EEDA22A55E8; Wed, 1 Jul 2020 12:51:56 +0100 (BST) Date: Wed, 1 Jul 2020 13:51:53 +0200 From: Boris Brezillon To: Enric Balletbo i Serra Cc: linux-kernel@vger.kernel.org, Collabora Kernel ML , narmstrong@baylibre.com, a.hajda@samsung.com, laurent.pinchart@ideasonboard.com, matthias.bgg@gmail.com, drinkcat@chromium.org, hsinyi@chromium.org, Chun-Kuang Hu , Daniel Vetter , David Airlie , Philipp Zabel , dri-devel@lists.freedesktop.org, linux-arm-kernel@lists.infradead.org, linux-mediatek@lists.infradead.org Subject: Re: [RESEND PATCH 2/3] drm/mediatek: mtk_dpi: Convert to bridge driver Message-ID: <20200701135153.475db3a5@collabora.com> In-Reply-To: <20200518173909.2259259-3-enric.balletbo@collabora.com> References: <20200518173909.2259259-1-enric.balletbo@collabora.com> <20200518173909.2259259-3-enric.balletbo@collabora.com> Organization: Collabora X-Mailer: Claws Mail 3.17.5 (GTK+ 2.24.32; x86_64-redhat-linux-gnu) MIME-Version: 1.0 Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: 7bit Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On Mon, 18 May 2020 19:39:08 +0200 Enric Balletbo i Serra wrote: > Convert mtk_dpi to a bridge driver with built-in encoder support for > compatibility with existing component drivers. > > Signed-off-by: Enric Balletbo i Serra > Reviewed-by: Chun-Kuang Hu > --- > > drivers/gpu/drm/mediatek/mtk_dpi.c | 66 +++++++++++++++--------------- > 1 file changed, 34 insertions(+), 32 deletions(-) > > diff --git a/drivers/gpu/drm/mediatek/mtk_dpi.c b/drivers/gpu/drm/mediatek/mtk_dpi.c > index 7112125dc3d1..baad198c69eb 100644 > --- a/drivers/gpu/drm/mediatek/mtk_dpi.c > +++ b/drivers/gpu/drm/mediatek/mtk_dpi.c > @@ -61,6 +61,7 @@ enum mtk_dpi_out_color_format { > struct mtk_dpi { > struct mtk_ddp_comp ddp_comp; > struct drm_encoder encoder; > + struct drm_bridge bridge; > struct drm_bridge *next_bridge; > void __iomem *regs; > struct device *dev; > @@ -77,9 +78,9 @@ struct mtk_dpi { > int refcount; > }; > > -static inline struct mtk_dpi *mtk_dpi_from_encoder(struct drm_encoder *e) > +static inline struct mtk_dpi *bridge_to_dpi(struct drm_bridge *b) > { > - return container_of(e, struct mtk_dpi, encoder); > + return container_of(b, struct mtk_dpi, bridge); > } > > enum mtk_dpi_polarity { > @@ -518,50 +519,44 @@ static const struct drm_encoder_funcs mtk_dpi_encoder_funcs = { > .destroy = mtk_dpi_encoder_destroy, > }; > > -static bool mtk_dpi_encoder_mode_fixup(struct drm_encoder *encoder, > - const struct drm_display_mode *mode, > - struct drm_display_mode *adjusted_mode) > +static int mtk_dpi_bridge_attach(struct drm_bridge *bridge, > + enum drm_bridge_attach_flags flags) > { > - return true; > + struct mtk_dpi *dpi = bridge_to_dpi(bridge); > + > + return drm_bridge_attach(bridge->encoder, dpi->next_bridge, > + &dpi->bridge, flags); > } > > -static void mtk_dpi_encoder_mode_set(struct drm_encoder *encoder, > - struct drm_display_mode *mode, > - struct drm_display_mode *adjusted_mode) > +static void mtk_dpi_bridge_mode_set(struct drm_bridge *bridge, > + const struct drm_display_mode *mode, > + const struct drm_display_mode *adjusted_mode) > { > - struct mtk_dpi *dpi = mtk_dpi_from_encoder(encoder); > + struct mtk_dpi *dpi = bridge_to_dpi(bridge); > > drm_mode_copy(&dpi->mode, adjusted_mode); > } > > -static void mtk_dpi_encoder_disable(struct drm_encoder *encoder) > +static void mtk_dpi_bridge_disable(struct drm_bridge *bridge) > { > - struct mtk_dpi *dpi = mtk_dpi_from_encoder(encoder); > + struct mtk_dpi *dpi = bridge_to_dpi(bridge); > > mtk_dpi_power_off(dpi); > } > > -static void mtk_dpi_encoder_enable(struct drm_encoder *encoder) > +static void mtk_dpi_bridge_enable(struct drm_bridge *bridge) > { > - struct mtk_dpi *dpi = mtk_dpi_from_encoder(encoder); > + struct mtk_dpi *dpi = bridge_to_dpi(bridge); > > mtk_dpi_power_on(dpi); > mtk_dpi_set_display_mode(dpi, &dpi->mode); > } > > -static int mtk_dpi_atomic_check(struct drm_encoder *encoder, > - struct drm_crtc_state *crtc_state, > - struct drm_connector_state *conn_state) > -{ > - return 0; > -} > - > -static const struct drm_encoder_helper_funcs mtk_dpi_encoder_helper_funcs = { > - .mode_fixup = mtk_dpi_encoder_mode_fixup, > - .mode_set = mtk_dpi_encoder_mode_set, > - .disable = mtk_dpi_encoder_disable, > - .enable = mtk_dpi_encoder_enable, > - .atomic_check = mtk_dpi_atomic_check, > +static const struct drm_bridge_funcs mtk_dpi_bridge_funcs = { > + .attach = mtk_dpi_bridge_attach, > + .mode_set = mtk_dpi_bridge_mode_set, > + .disable = mtk_dpi_bridge_disable, > + .enable = mtk_dpi_bridge_enable, > }; > > static void mtk_dpi_start(struct mtk_ddp_comp *comp) > @@ -602,16 +597,13 @@ static int mtk_dpi_bind(struct device *dev, struct device *master, void *data) > dev_err(dev, "Failed to initialize decoder: %d\n", ret); > goto err_unregister; > } > - drm_encoder_helper_add(&dpi->encoder, &mtk_dpi_encoder_helper_funcs); > > /* Currently DPI0 is fixed to be driven by OVL1 */ > dpi->encoder.possible_crtcs = BIT(1); > > - ret = drm_bridge_attach(&dpi->encoder, dpi->next_bridge, NULL, 0); > - if (ret) { > - dev_err(dev, "Failed to attach bridge: %d\n", ret); Any reason your decided to drop this error message? If there's one, this should probably happen in a separate patch. > + ret = drm_bridge_attach(&dpi->encoder, &dpi->bridge, NULL, 0); > + if (ret) > goto err_cleanup; > - } > > dpi->bit_num = MTK_DPI_OUT_BIT_NUM_8BITS; > dpi->channel_swap = MTK_DPI_OUT_CHANNEL_SWAP_RGB; > @@ -768,8 +760,15 @@ static int mtk_dpi_probe(struct platform_device *pdev) > > platform_set_drvdata(pdev, dpi); > > + dpi->bridge.funcs = &mtk_dpi_bridge_funcs; > + dpi->bridge.of_node = dev->of_node; > + dpi->bridge.type = DRM_MODE_CONNECTOR_DPI; > + > + drm_bridge_add(&dpi->bridge); I wonder if it's really useful to add the bridge when it's private (you don't want this bridge to be added to external bridge chains). > + > ret = component_add(dev, &mtk_dpi_component_ops); > if (ret) { > + drm_bridge_remove(&dpi->bridge); > dev_err(dev, "Failed to add component: %d\n", ret); > return ret; > } > @@ -779,7 +778,10 @@ static int mtk_dpi_probe(struct platform_device *pdev) > > static int mtk_dpi_remove(struct platform_device *pdev) > { > + struct mtk_dpi *dpi = platform_get_drvdata(pdev); > + > component_del(&pdev->dev, &mtk_dpi_component_ops); > + drm_bridge_remove(&dpi->bridge); > > return 0; > }