If other drivers use the exynos_dsi driver as a bridge, they might bring
their own encoder. Enable and disable the MIPI-DSI bridge using the
bridge functions instead of the encoder functions.
Signed-off-by: Michael Tretter <m.tret...@pengutronix.de>
---
 drivers/gpu/drm/exynos/exynos_drm_dsi.c | 33 +++++++++++++++----------
 1 file changed, 20 insertions(+), 13 deletions(-)

diff --git a/drivers/gpu/drm/exynos/exynos_drm_dsi.c 
b/drivers/gpu/drm/exynos/exynos_drm_dsi.c
index 4d19630f33e7..31d62c10614a 100644
--- a/drivers/gpu/drm/exynos/exynos_drm_dsi.c
+++ b/drivers/gpu/drm/exynos/exynos_drm_dsi.c
@@ -1376,9 +1376,8 @@ static void exynos_dsi_unregister_te_irq(struct 
exynos_dsi *dsi)
        }
 }
 
-static void exynos_dsi_enable(struct drm_encoder *encoder)
+static void exynos_dsi_enable(struct exynos_dsi *dsi)
 {
-       struct exynos_dsi *dsi = encoder_to_dsi(encoder);
        struct drm_bridge *iter;
        int ret;
 
@@ -1426,9 +1425,8 @@ static void exynos_dsi_enable(struct drm_encoder *encoder)
        pm_runtime_put(dsi->dev);
 }
 
-static void exynos_dsi_disable(struct drm_encoder *encoder)
+static void exynos_dsi_disable(struct exynos_dsi *dsi)
 {
-       struct exynos_dsi *dsi = encoder_to_dsi(encoder);
        struct drm_bridge *iter;
 
        if (!(dsi->state & DSIM_STATE_ENABLED))
@@ -1519,11 +1517,6 @@ static int exynos_dsi_create_connector(struct 
drm_encoder *encoder)
        return 0;
 }
 
-static const struct drm_encoder_helper_funcs exynos_dsi_encoder_helper_funcs = 
{
-       .enable = exynos_dsi_enable,
-       .disable = exynos_dsi_disable,
-};
-
 static int exynos_dsi_bridge_attach(struct drm_bridge *bridge,
                                    enum drm_bridge_attach_flags flags)
 {
@@ -1537,8 +1530,24 @@ static int exynos_dsi_bridge_attach(struct drm_bridge 
*bridge,
        return 0;
 }
 
+static void exynos_dsi_bridge_enable(struct drm_bridge *bridge)
+{
+       struct exynos_dsi *dsi = bridge->driver_private;
+
+       exynos_dsi_enable(dsi);
+}
+
+static void exynos_dsi_bridge_disable(struct drm_bridge *bridge)
+{
+       struct exynos_dsi *dsi = bridge->driver_private;
+
+       exynos_dsi_disable(dsi);
+}
+
 static const struct drm_bridge_funcs exynos_dsi_bridge_funcs = {
        .attach = exynos_dsi_bridge_attach,
+       .enable = exynos_dsi_bridge_enable,
+       .disable = exynos_dsi_bridge_disable,
 };
 
 MODULE_DEVICE_TABLE(of, exynos_dsi_of_match);
@@ -1619,7 +1628,7 @@ static int exynos_dsi_host_detach(struct mipi_dsi_host 
*host,
 
        if (dsi->panel) {
                mutex_lock(&drm->mode_config.mutex);
-               exynos_dsi_disable(&dsi->encoder);
+               exynos_dsi_disable(dsi);
                drm_panel_detach(dsi->panel);
                dsi->panel = NULL;
                dsi->connector.status = connector_status_disconnected;
@@ -1726,8 +1735,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;
@@ -1753,7 +1760,7 @@ static void exynos_dsi_unbind(struct device *dev, struct 
device *master,
        struct drm_encoder *encoder = dev_get_drvdata(dev);
        struct exynos_dsi *dsi = encoder_to_dsi(encoder);
 
-       exynos_dsi_disable(encoder);
+       exynos_dsi_disable(dsi);
 
        mipi_dsi_host_unregister(&dsi->dsi_host);
 }
-- 
2.20.1

_______________________________________________
dri-devel mailing list
dri-devel@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/dri-devel

Reply via email to