drm/mediatek: mtk_dpi: Create connector for bridges

Similar to commit 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>
Signed-off-by: Chun-Kuang Hu <chunkuang.hu@kernel.org>

diff --git a/drivers/gpu/drm/mediatek/mtk_dpi.c b/drivers/gpu/drm/mediatek/mtk_dpi.c
index 88a6856024c214cc96e9e9df12c554909843ab34..b05f900d9322ef16977b3d0faa529c26044475d4 100644 (file)
--- 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;
@@ -591,12 +593,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->dev);
 
-       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;