drm: exynos: dsi: Convert to bridge driver

Convert the encoders to bridge drivers in order to standardize on
a single API with built-in dumb encoder support for compatibility
with existing component drivers.

Driver bridge conversion will help to reuse the same bridge on
different platforms as exynos dsi driver can be used as a Samsung
DSIM and use it for i.MX8MM platform.

Bridge conversion,

- Drops drm_encoder_helper_funcs.

- Adds drm_bridge_funcs and register a drm bridge.

- Drops bridge_chain.

- Separate pre_enable from enable function.

- Separate post_disable from disable function.

Convert it.

Signed-off-by: Jagan Teki <jagan@amarulasolutions.com>
Acked-by: Marek Szyprowski <m.szyprowski@samsung.com>
Tested-by: Marek Szyprowski <m.szyprowski@samsung.com>
Signed-off-by: Robert Foss <robert.foss@linaro.org>
Link: https://patchwork.freedesktop.org/patch/msgid/20220303163654.3381470-6-jagan@amarulasolutions.com

diff --git a/drivers/gpu/drm/exynos/exynos_drm_dsi.c b/drivers/gpu/drm/exynos/exynos_drm_dsi.c
index 953094133ed8b186906c63b9cddd111be30297c5..59a4f7f521806cdb7b61d4c6bbb2a26ba40a7423 100644 (file)
--- a/drivers/gpu/drm/exynos/exynos_drm_dsi.c
+++ b/drivers/gpu/drm/exynos/exynos_drm_dsi.c
@@ -251,7 +251,7 @@ struct exynos_dsi_driver_data {
 struct exynos_dsi {
        struct drm_encoder encoder;
        struct mipi_dsi_host dsi_host;
-       struct list_head bridge_chain;
+       struct drm_bridge bridge;
        struct drm_bridge *out_bridge;
        struct device *dev;
        struct drm_display_mode mode;
@@ -282,9 +282,9 @@ struct exynos_dsi {
 
 #define host_to_dsi(host) container_of(host, struct exynos_dsi, dsi_host)
 
-static inline struct exynos_dsi *encoder_to_dsi(struct drm_encoder *e)
+static inline struct exynos_dsi *bridge_to_dsi(struct drm_bridge *b)
 {
-       return container_of(e, struct exynos_dsi, encoder);
+       return container_of(b, struct exynos_dsi, bridge);
 }
 
 enum reg_idx {
@@ -1358,10 +1358,9 @@ static void exynos_dsi_unregister_te_irq(struct exynos_dsi *dsi)
        }
 }
 
-static void exynos_dsi_enable(struct drm_encoder *encoder)
+static void exynos_dsi_pre_enable(struct drm_bridge *bridge)
 {
-       struct exynos_dsi *dsi = encoder_to_dsi(encoder);
-       struct drm_bridge *iter;
+       struct exynos_dsi *dsi = bridge_to_dsi(bridge);
        int ret;
 
        if (dsi->state & DSIM_STATE_ENABLED)
@@ -1374,63 +1373,64 @@ static void exynos_dsi_enable(struct drm_encoder *encoder)
        }
 
        dsi->state |= DSIM_STATE_ENABLED;
+}
 
-       list_for_each_entry_reverse(iter, &dsi->bridge_chain, chain_node) {
-               if (iter->funcs->pre_enable)
-                       iter->funcs->pre_enable(iter);
-       }
+static void exynos_dsi_enable(struct drm_bridge *bridge)
+{
+       struct exynos_dsi *dsi = bridge_to_dsi(bridge);
 
        exynos_dsi_set_display_mode(dsi);
        exynos_dsi_set_display_enable(dsi, true);
 
-       list_for_each_entry(iter, &dsi->bridge_chain, chain_node) {
-               if (iter->funcs->enable)
-                       iter->funcs->enable(iter);
-       }
-
        dsi->state |= DSIM_STATE_VIDOUT_AVAILABLE;
+
        return;
 }
 
-static void exynos_dsi_disable(struct drm_encoder *encoder)
+static void exynos_dsi_disable(struct drm_bridge *bridge)
 {
-       struct exynos_dsi *dsi = encoder_to_dsi(encoder);
-       struct drm_bridge *iter;
+       struct exynos_dsi *dsi = bridge_to_dsi(bridge);
 
        if (!(dsi->state & DSIM_STATE_ENABLED))
                return;
 
        dsi->state &= ~DSIM_STATE_VIDOUT_AVAILABLE;
+}
 
-       list_for_each_entry_reverse(iter, &dsi->bridge_chain, chain_node) {
-               if (iter->funcs->disable)
-                       iter->funcs->disable(iter);
-       }
+static void exynos_dsi_post_disable(struct drm_bridge *bridge)
+{
+       struct exynos_dsi *dsi = bridge_to_dsi(bridge);
 
        exynos_dsi_set_display_enable(dsi, false);
 
-       list_for_each_entry(iter, &dsi->bridge_chain, chain_node) {
-               if (iter->funcs->post_disable)
-                       iter->funcs->post_disable(iter);
-       }
-
        dsi->state &= ~DSIM_STATE_ENABLED;
        pm_runtime_put_sync(dsi->dev);
 }
 
-static void exynos_dsi_mode_set(struct drm_encoder *encoder,
-                               struct drm_display_mode *mode,
-                               struct drm_display_mode *adjusted_mode)
+static void exynos_dsi_mode_set(struct drm_bridge *bridge,
+                               const struct drm_display_mode *mode,
+                               const struct drm_display_mode *adjusted_mode)
 {
-       struct exynos_dsi *dsi = encoder_to_dsi(encoder);
+       struct exynos_dsi *dsi = bridge_to_dsi(bridge);
 
        drm_mode_copy(&dsi->mode, adjusted_mode);
 }
 
-static const struct drm_encoder_helper_funcs exynos_dsi_encoder_helper_funcs = {
-       .enable = exynos_dsi_enable,
-       .disable = exynos_dsi_disable,
-       .mode_set = exynos_dsi_mode_set,
+static int exynos_dsi_attach(struct drm_bridge *bridge,
+                            enum drm_bridge_attach_flags flags)
+{
+       struct exynos_dsi *dsi = bridge_to_dsi(bridge);
+
+       return drm_bridge_attach(bridge->encoder, dsi->out_bridge, NULL, flags);
+}
+
+static const struct drm_bridge_funcs exynos_dsi_bridge_funcs = {
+       .pre_enable                     = exynos_dsi_pre_enable,
+       .enable                         = exynos_dsi_enable,
+       .disable                        = exynos_dsi_disable,
+       .post_disable                   = exynos_dsi_post_disable,
+       .mode_set                       = exynos_dsi_mode_set,
+       .attach                         = exynos_dsi_attach,
 };
 
 MODULE_DEVICE_TABLE(of, exynos_dsi_of_match);
@@ -1453,8 +1453,9 @@ static int exynos_dsi_host_attach(struct mipi_dsi_host *host,
 
        DRM_DEV_INFO(dev, "Attached %s device\n", device->name);
 
-       drm_bridge_attach(encoder, dsi->out_bridge, NULL, 0);
-       list_splice_init(&encoder->bridge_chain, &dsi->bridge_chain);
+       drm_bridge_add(&dsi->bridge);
+
+       drm_bridge_attach(encoder, &dsi->bridge, NULL, 0);
 
        /*
         * This is a temporary solution and should be made by more generic way.
@@ -1493,13 +1494,14 @@ static int exynos_dsi_host_detach(struct mipi_dsi_host *host,
        if (dsi->out_bridge->funcs->detach)
                dsi->out_bridge->funcs->detach(dsi->out_bridge);
        dsi->out_bridge = NULL;
-       INIT_LIST_HEAD(&dsi->bridge_chain);
 
        if (drm->mode_config.poll_enabled)
                drm_kms_helper_hotplug_event(drm);
 
        exynos_dsi_unregister_te_irq(dsi);
 
+       drm_bridge_remove(&dsi->bridge);
+
        return 0;
 }
 
@@ -1583,8 +1585,6 @@ static int exynos_dsi_bind(struct device *dev, struct device *master,
 
        drm_simple_encoder_init(drm_dev, encoder, DRM_MODE_ENCODER_TMDS);
 
-       drm_encoder_helper_add(encoder, &exynos_dsi_encoder_helper_funcs);
-
        ret = exynos_drm_set_possible_crtcs(encoder, EXYNOS_DISPLAY_TYPE_LCD);
        if (ret < 0)
                return ret;
@@ -1596,9 +1596,8 @@ static void exynos_dsi_unbind(struct device *dev, struct device *master,
                                void *data)
 {
        struct exynos_dsi *dsi = dev_get_drvdata(dev);
-       struct drm_encoder *encoder = &dsi->encoder;
 
-       exynos_dsi_disable(encoder);
+       exynos_dsi_disable(&dsi->bridge);
 
        mipi_dsi_host_unregister(&dsi->dsi_host);
 }
@@ -1621,7 +1620,6 @@ static int exynos_dsi_probe(struct platform_device *pdev)
        init_completion(&dsi->completed);
        spin_lock_init(&dsi->transfer_lock);
        INIT_LIST_HEAD(&dsi->transfer_list);
-       INIT_LIST_HEAD(&dsi->bridge_chain);
 
        dsi->dsi_host.ops = &exynos_dsi_ops;
        dsi->dsi_host.dev = dev;
@@ -1689,6 +1687,10 @@ static int exynos_dsi_probe(struct platform_device *pdev)
 
        pm_runtime_enable(dev);
 
+       dsi->bridge.funcs = &exynos_dsi_bridge_funcs;
+       dsi->bridge.of_node = dev->of_node;
+       dsi->bridge.type = DRM_MODE_CONNECTOR_DSI;
+
        ret = component_add(dev, &exynos_dsi_component_ops);
        if (ret)
                goto err_disable_runtime;