]> git.baikalelectronics.ru Git - kernel.git/commitdiff
drm/mediatek: mtk_dsi: Create connector for bridges
authorEnric Balletbo i Serra <enric.balletbo@collabora.com>
Mon, 15 Jun 2020 20:31:08 +0000 (22:31 +0200)
committerChun-Kuang Hu <chunkuang.hu@kernel.org>
Sun, 5 Jul 2020 00:06:28 +0000 (08:06 +0800)
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: Enric Balletbo i Serra <enric.balletbo@collabora.com>
Acked-by: Sam Ravnborg <sam@ravnborg.org>
Signed-off-by: Chun-Kuang Hu <chunkuang.hu@kernel.org>
drivers/gpu/drm/mediatek/mtk_dsi.c

index d5df3986d6177295c03325e122b806da0c4fb6bc..16fd99dcdacf8316ba598600c43578ae7120d42b 100644 (file)
@@ -17,6 +17,7 @@
 
 #include <drm/drm_atomic_helper.h>
 #include <drm/drm_bridge.h>
+#include <drm/drm_bridge_connector.h>
 #include <drm/drm_mipi_dsi.h>
 #include <drm/drm_of.h>
 #include <drm/drm_panel.h>
@@ -183,6 +184,7 @@ struct mtk_dsi {
        struct drm_encoder encoder;
        struct drm_bridge bridge;
        struct drm_bridge *next_bridge;
+       struct drm_connector *connector;
        struct phy *phy;
 
        void __iomem *regs;
@@ -974,10 +976,19 @@ static int mtk_dsi_encoder_init(struct drm_device *drm, struct mtk_dsi *dsi)
         */
        dsi->encoder.possible_crtcs = 1;
 
-       ret = drm_bridge_attach(&dsi->encoder, &dsi->bridge, NULL, 0);
+       ret = drm_bridge_attach(&dsi->encoder, &dsi->bridge, NULL,
+                               DRM_BRIDGE_ATTACH_NO_CONNECTOR);
        if (ret)
                goto err_cleanup_encoder;
 
+       dsi->connector = drm_bridge_connector_init(drm, &dsi->encoder);
+       if (IS_ERR(dsi->connector)) {
+               DRM_ERROR("Unable to create bridge connector\n");
+               ret = PTR_ERR(dsi->connector);
+               goto err_cleanup_encoder;
+       }
+       drm_connector_attach_encoder(dsi->connector, &dsi->encoder);
+
        return 0;
 
 err_cleanup_encoder: