diff mbox series

drm/mediatek: mtk_dpi: Create connector for bridges

Message ID 20201203082445.1342763-1-hsinyi@chromium.org (mailing list archive)
State New, archived
Headers show
Series drm/mediatek: mtk_dpi: Create connector for bridges | expand

Commit Message

Hsin-Yi Wang Dec. 3, 2020, 8:24 a.m. UTC
Similar to a9d9fea74be2 ("drm/mediatek: mtk_dsi: Create connector for bridges"):

Use the drm_bridge_connector helper to create a connector for pipelines
that use drm_bridge. This allows splitting connector operations across
multiple bridges when necessary, instead of having the last bridge in
the chain creating the connector and handling all connector operations
internally.

Signed-off-by: Hsin-Yi Wang <hsinyi@chromium.org>
---
 drivers/gpu/drm/mediatek/mtk_dpi.c | 13 ++++++++++++-
 1 file changed, 12 insertions(+), 1 deletion(-)

Comments

Chun-Kuang Hu Dec. 11, 2020, 2:04 p.m. UTC | #1
Hi, Hsin-Yi:

Hsin-Yi Wang <hsinyi@chromium.org> 於 2020年12月3日 週四 下午4:24寫道:
>
> Similar to a9d9fea74be2 ("drm/mediatek: mtk_dsi: Create connector for bridges"):
>
> Use the drm_bridge_connector helper to create a connector for pipelines
> that use drm_bridge. This allows splitting connector operations across
> multiple bridges when necessary, instead of having the last bridge in
> the chain creating the connector and handling all connector operations
> internally.

Reviewed-by: Chun-Kuang Hu <chunkuang.hu@kernel.org>

>
> Signed-off-by: Hsin-Yi Wang <hsinyi@chromium.org>
> ---
>  drivers/gpu/drm/mediatek/mtk_dpi.c | 13 ++++++++++++-
>  1 file changed, 12 insertions(+), 1 deletion(-)
>
> diff --git a/drivers/gpu/drm/mediatek/mtk_dpi.c b/drivers/gpu/drm/mediatek/mtk_dpi.c
> index 52f11a63a330..189377e342fa 100644
> --- a/drivers/gpu/drm/mediatek/mtk_dpi.c
> +++ b/drivers/gpu/drm/mediatek/mtk_dpi.c
> @@ -20,6 +20,7 @@
>
>  #include <drm/drm_atomic_helper.h>
>  #include <drm/drm_bridge.h>
> +#include <drm/drm_bridge_connector.h>
>  #include <drm/drm_crtc.h>
>  #include <drm/drm_of.h>
>  #include <drm/drm_simple_kms_helper.h>
> @@ -66,6 +67,7 @@ struct mtk_dpi {
>         struct drm_encoder encoder;
>         struct drm_bridge bridge;
>         struct drm_bridge *next_bridge;
> +       struct drm_connector *connector;
>         void __iomem *regs;
>         struct device *dev;
>         struct clk *engine_clk;
> @@ -603,12 +605,21 @@ static int mtk_dpi_bind(struct device *dev, struct device *master, void *data)
>
>         dpi->encoder.possible_crtcs = mtk_drm_find_possible_crtc_by_comp(drm_dev, dpi->ddp_comp);
>
> -       ret = drm_bridge_attach(&dpi->encoder, &dpi->bridge, NULL, 0);
> +       ret = drm_bridge_attach(&dpi->encoder, &dpi->bridge, NULL,
> +                               DRM_BRIDGE_ATTACH_NO_CONNECTOR);
>         if (ret) {
>                 dev_err(dev, "Failed to attach bridge: %d\n", ret);
>                 goto err_cleanup;
>         }
>
> +       dpi->connector = drm_bridge_connector_init(drm_dev, &dpi->encoder);
> +       if (IS_ERR(dpi->connector)) {
> +               dev_err(dev, "Unable to create bridge connector\n");
> +               ret = PTR_ERR(dpi->connector);
> +               goto err_cleanup;
> +       }
> +       drm_connector_attach_encoder(dpi->connector, &dpi->encoder);
> +
>         dpi->bit_num = MTK_DPI_OUT_BIT_NUM_8BITS;
>         dpi->channel_swap = MTK_DPI_OUT_CHANNEL_SWAP_RGB;
>         dpi->yc_map = MTK_DPI_OUT_YC_MAP_RGB;
> --
> 2.29.2.576.ga3fc446d84-goog
>
Chun-Kuang Hu Jan. 13, 2021, 11:48 p.m. UTC | #2
Hi, Hsin-Yi:

Chun-Kuang Hu <chunkuang.hu@kernel.org> 於 2020年12月11日 週五 下午10:04寫道:
>
> Hi, Hsin-Yi:
>
> Hsin-Yi Wang <hsinyi@chromium.org> 於 2020年12月3日 週四 下午4:24寫道:
> >
> > Similar to a9d9fea74be2 ("drm/mediatek: mtk_dsi: Create connector for bridges"):
> >
> > Use the drm_bridge_connector helper to create a connector for pipelines
> > that use drm_bridge. This allows splitting connector operations across
> > multiple bridges when necessary, instead of having the last bridge in
> > the chain creating the connector and handling all connector operations
> > internally.
>
> Reviewed-by: Chun-Kuang Hu <chunkuang.hu@kernel.org>

Applied to mediatek-drm-next [1], thanks.

[1] https://git.kernel.org/pub/scm/linux/kernel/git/chunkuang.hu/linux.git/log/?h=mediatek-drm-next

Regards,
Chun-Kuang.

>
> >
> > Signed-off-by: Hsin-Yi Wang <hsinyi@chromium.org>
> > ---
> >  drivers/gpu/drm/mediatek/mtk_dpi.c | 13 ++++++++++++-
> >  1 file changed, 12 insertions(+), 1 deletion(-)
> >
> > diff --git a/drivers/gpu/drm/mediatek/mtk_dpi.c b/drivers/gpu/drm/mediatek/mtk_dpi.c
> > index 52f11a63a330..189377e342fa 100644
> > --- a/drivers/gpu/drm/mediatek/mtk_dpi.c
> > +++ b/drivers/gpu/drm/mediatek/mtk_dpi.c
> > @@ -20,6 +20,7 @@
> >
> >  #include <drm/drm_atomic_helper.h>
> >  #include <drm/drm_bridge.h>
> > +#include <drm/drm_bridge_connector.h>
> >  #include <drm/drm_crtc.h>
> >  #include <drm/drm_of.h>
> >  #include <drm/drm_simple_kms_helper.h>
> > @@ -66,6 +67,7 @@ struct mtk_dpi {
> >         struct drm_encoder encoder;
> >         struct drm_bridge bridge;
> >         struct drm_bridge *next_bridge;
> > +       struct drm_connector *connector;
> >         void __iomem *regs;
> >         struct device *dev;
> >         struct clk *engine_clk;
> > @@ -603,12 +605,21 @@ static int mtk_dpi_bind(struct device *dev, struct device *master, void *data)
> >
> >         dpi->encoder.possible_crtcs = mtk_drm_find_possible_crtc_by_comp(drm_dev, dpi->ddp_comp);
> >
> > -       ret = drm_bridge_attach(&dpi->encoder, &dpi->bridge, NULL, 0);
> > +       ret = drm_bridge_attach(&dpi->encoder, &dpi->bridge, NULL,
> > +                               DRM_BRIDGE_ATTACH_NO_CONNECTOR);
> >         if (ret) {
> >                 dev_err(dev, "Failed to attach bridge: %d\n", ret);
> >                 goto err_cleanup;
> >         }
> >
> > +       dpi->connector = drm_bridge_connector_init(drm_dev, &dpi->encoder);
> > +       if (IS_ERR(dpi->connector)) {
> > +               dev_err(dev, "Unable to create bridge connector\n");
> > +               ret = PTR_ERR(dpi->connector);
> > +               goto err_cleanup;
> > +       }
> > +       drm_connector_attach_encoder(dpi->connector, &dpi->encoder);
> > +
> >         dpi->bit_num = MTK_DPI_OUT_BIT_NUM_8BITS;
> >         dpi->channel_swap = MTK_DPI_OUT_CHANNEL_SWAP_RGB;
> >         dpi->yc_map = MTK_DPI_OUT_YC_MAP_RGB;
> > --
> > 2.29.2.576.ga3fc446d84-goog
> >
diff mbox series

Patch

diff --git a/drivers/gpu/drm/mediatek/mtk_dpi.c b/drivers/gpu/drm/mediatek/mtk_dpi.c
index 52f11a63a330..189377e342fa 100644
--- a/drivers/gpu/drm/mediatek/mtk_dpi.c
+++ b/drivers/gpu/drm/mediatek/mtk_dpi.c
@@ -20,6 +20,7 @@ 
 
 #include <drm/drm_atomic_helper.h>
 #include <drm/drm_bridge.h>
+#include <drm/drm_bridge_connector.h>
 #include <drm/drm_crtc.h>
 #include <drm/drm_of.h>
 #include <drm/drm_simple_kms_helper.h>
@@ -66,6 +67,7 @@  struct mtk_dpi {
 	struct drm_encoder encoder;
 	struct drm_bridge bridge;
 	struct drm_bridge *next_bridge;
+	struct drm_connector *connector;
 	void __iomem *regs;
 	struct device *dev;
 	struct clk *engine_clk;
@@ -603,12 +605,21 @@  static int mtk_dpi_bind(struct device *dev, struct device *master, void *data)
 
 	dpi->encoder.possible_crtcs = mtk_drm_find_possible_crtc_by_comp(drm_dev, dpi->ddp_comp);
 
-	ret = drm_bridge_attach(&dpi->encoder, &dpi->bridge, NULL, 0);
+	ret = drm_bridge_attach(&dpi->encoder, &dpi->bridge, NULL,
+				DRM_BRIDGE_ATTACH_NO_CONNECTOR);
 	if (ret) {
 		dev_err(dev, "Failed to attach bridge: %d\n", ret);
 		goto err_cleanup;
 	}
 
+	dpi->connector = drm_bridge_connector_init(drm_dev, &dpi->encoder);
+	if (IS_ERR(dpi->connector)) {
+		dev_err(dev, "Unable to create bridge connector\n");
+		ret = PTR_ERR(dpi->connector);
+		goto err_cleanup;
+	}
+	drm_connector_attach_encoder(dpi->connector, &dpi->encoder);
+
 	dpi->bit_num = MTK_DPI_OUT_BIT_NUM_8BITS;
 	dpi->channel_swap = MTK_DPI_OUT_CHANNEL_SWAP_RGB;
 	dpi->yc_map = MTK_DPI_OUT_YC_MAP_RGB;