drm/stm: ltdc: remove bridge from driver internal structure

With a call to drm_of_panel_bridge_remove() we could remove the bridge
without store it in ldtc internal driver structure.

Signed-off-by: Benjamin Gaignard <benjamin.gaignard@linaro.org>
Reviewed-by: Philippe Cornu <philippe.cornu@st.com>
Tested-by: Philippe Cornu <philippe.cornu@st.com>
Link: https://patchwork.freedesktop.org/patch/msgid/1506936888-23844-4-git-send-email-benjamin.gaignard@linaro.org

diff --git a/drivers/gpu/drm/stm/ltdc.c b/drivers/gpu/drm/stm/ltdc.c
index d394a03..735c908 100644 (file)
--- a/drivers/gpu/drm/stm/ltdc.c
+++ b/drivers/gpu/drm/stm/ltdc.c
@@ -791,9 +791,8 @@ static const struct drm_encoder_funcs ltdc_encoder_funcs = {
        .destroy = drm_encoder_cleanup,
 };
 
-static int ltdc_encoder_init(struct drm_device *ddev)
+static int ltdc_encoder_init(struct drm_device *ddev, struct drm_bridge *bridge)
 {
-       struct ltdc_device *ldev = ddev->dev_private;
        struct drm_encoder *encoder;
        int ret;
 
@@ -807,7 +806,7 @@ static int ltdc_encoder_init(struct drm_device *ddev)
        drm_encoder_init(ddev, encoder, &ltdc_encoder_funcs,
                         DRM_MODE_ENCODER_DPI, NULL);
 
-       ret = drm_bridge_attach(encoder, ldev->bridge, NULL);
+       ret = drm_bridge_attach(encoder, bridge, NULL);
        if (ret) {
                drm_encoder_cleanup(encoder);
                return -EINVAL;
@@ -936,12 +935,9 @@ int ltdc_load(struct drm_device *ddev)
                        ret = PTR_ERR(bridge);
                        goto err;
                }
-               ldev->is_panel_bridge = true;
        }
 
-       ldev->bridge = bridge;
-
-       ret = ltdc_encoder_init(ddev);
+       ret = ltdc_encoder_init(ddev, bridge);
        if (ret) {
                DRM_ERROR("Failed to init encoder\n");
                goto err;
@@ -972,8 +968,7 @@ int ltdc_load(struct drm_device *ddev)
        return 0;
 
 err:
-       if (ldev->is_panel_bridge)
-               drm_panel_bridge_remove(bridge);
+       drm_panel_bridge_remove(bridge);
 
        clk_disable_unprepare(ldev->pixel_clk);
 
@@ -986,8 +981,7 @@ void ltdc_unload(struct drm_device *ddev)
 
        DRM_DEBUG_DRIVER("\n");
 
-       if (ldev->is_panel_bridge)
-               drm_panel_bridge_remove(ldev->bridge);
+       drm_of_panel_bridge_remove(ddev->dev->of_node, 0, 0);
 
        clk_disable_unprepare(ldev->pixel_clk);
 }

diff --git a/drivers/gpu/drm/stm/ltdc.h b/drivers/gpu/drm/stm/ltdc.h
index bc6d6f6..ae43755 100644 (file)
--- a/drivers/gpu/drm/stm/ltdc.h
+++ b/drivers/gpu/drm/stm/ltdc.h
@@ -24,8 +24,6 @@ struct ltdc_device {
        struct drm_fbdev_cma *fbdev;
        void __iomem *regs;
        struct clk *pixel_clk;  /* lcd pixel clock */
-       struct drm_bridge *bridge;
-       bool is_panel_bridge;
        struct mutex err_lock;  /* protecting error_status */
        struct ltdc_caps caps;
        u32 error_status;