drm/tve200: Clean up panel bridging

This makes use of the drm_simple_display_pipe_attach_bridge()
call and removes the two calls removing the bridge, which were
erroneous: they unregister the bridge which is not what
we want, we just want to unreference it and that is already
handled by the core.

Reviewed-by: Eric Anholt <eric@anholt.net>
Acked-by: Daniel Vetter <daniel.vetter@ffwll.ch>
Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
Link: https://patchwork.freedesktop.org/patch/msgid/20170910220801.28588-1-linus.walleij@linaro.org

diff --git a/drivers/gpu/drm/tve200/tve200_display.c b/drivers/gpu/drm/tve200/tve200_display.c
index 1ad02fdbb074163781ea21ff3caff44e910580a1..18457de47bbc00148431638d4073dd1a85f2a02e 100644 (file)
--- a/drivers/gpu/drm/tve200/tve200_display.c
+++ b/drivers/gpu/drm/tve200/tve200_display.c
@@ -333,8 +333,5 @@ int tve200_display_init(struct drm_device *drm)
        if (ret)
                return ret;
 
-       /* We need the encoder to attach the bridge */
-       priv->encoder = &priv->pipe.encoder;
-
        return 0;
 }

diff --git a/drivers/gpu/drm/tve200/tve200_drm.h b/drivers/gpu/drm/tve200/tve200_drm.h
index b463624c1f29bc0d5f47aa3e2e9c35576f4cc187..628b79324c489ed3872ea451d679e1702f64f6da 100644 (file)
--- a/drivers/gpu/drm/tve200/tve200_drm.h
+++ b/drivers/gpu/drm/tve200/tve200_drm.h
@@ -100,7 +100,6 @@ struct tve200_drm_dev_private {
        struct drm_device *drm;
 
        struct drm_connector *connector;
-       struct drm_encoder *encoder;
        struct drm_panel *panel;
        struct drm_bridge *bridge;
        struct drm_simple_display_pipe pipe;

diff --git a/drivers/gpu/drm/tve200/tve200_drv.c b/drivers/gpu/drm/tve200/tve200_drv.c
index c22644692a88c1432e5cc2e1965a1713cc288b90..eae38b669f0a3a0eb101fd0ebca221a2395918db 100644 (file)
--- a/drivers/gpu/drm/tve200/tve200_drv.c
+++ b/drivers/gpu/drm/tve200/tve200_drv.c
@@ -87,6 +87,14 @@ static int tve200_modeset_init(struct drm_device *dev)
                        ret = PTR_ERR(bridge);
                        goto out_bridge;
                }
+       } else {
+               /*
+                * TODO: when we are using a different bridge than a panel
+                * (such as a dumb VGA connector) we need to devise a different
+                * method to get the connector out of the bridge.
+                */
+               dev_err(dev->dev, "the bridge is not a panel\n");
+               goto out_bridge;
        }
 
        ret = tve200_display_init(dev);
@@ -95,21 +103,13 @@ static int tve200_modeset_init(struct drm_device *dev)
                goto out_bridge;
        }
 
-       if (bridge) {
-               ret = drm_bridge_attach(priv->encoder, bridge, NULL);
-               if (ret)
-                       goto out_bridge;
-       }
-
-       /*
-        * TODO: when we are using a different bridge than a panel
-        * (such as a dumb VGA connector) we need to devise a different
-        * method to get the connector out of the bridge.
-        */
-       if (!panel) {
-               dev_err(dev->dev, "the bridge is not a panel\n");
+       ret = drm_simple_display_pipe_attach_bridge(&priv->pipe,
+                                                   bridge);
+       if (ret) {
+               dev_err(dev->dev, "failed to attach bridge\n");
                goto out_bridge;
        }
+
        priv->panel = panel;
        priv->connector = panel->connector;
        priv->bridge = bridge;
@@ -138,8 +138,6 @@ static int tve200_modeset_init(struct drm_device *dev)
 out_bridge:
        if (panel)
                drm_panel_bridge_remove(bridge);
-       else
-               drm_bridge_remove(bridge);
        drm_mode_config_cleanup(dev);
 finish:
        return ret;
@@ -275,8 +273,6 @@ static int tve200_remove(struct platform_device *pdev)
                drm_fbdev_cma_fini(priv->fbdev);
        if (priv->panel)
                drm_panel_bridge_remove(priv->bridge);
-       else
-               drm_bridge_remove(priv->bridge);
        drm_mode_config_cleanup(drm);
        clk_disable_unprepare(priv->pclk);
        drm_dev_unref(drm);