drm/armada: replace the simple-framebuffer

If there's a simple-framebuffer carried over from boot firmware, it's going
to stop working once we setup the LCDC for use via DRM. Kick it off from
the hardware.

Signed-off-by: Lubomir Rintel <lkundrak@v3.sk>
Signed-off-by: Russell King <rmk+kernel@armlinux.org.uk>

diff --git a/drivers/gpu/drm/armada/armada_drv.c b/drivers/gpu/drm/armada/armada_drv.c
index e524bff..05fab5c 100644 (file)
--- a/drivers/gpu/drm/armada/armada_drv.c
+++ b/drivers/gpu/drm/armada/armada_drv.c
@@ -100,6 +100,17 @@ static int armada_drm_bind(struct device *dev)
                return ret;
        }
 
+       /* Remove early framebuffers */
+       ret = drm_fb_helper_remove_conflicting_framebuffers(NULL,
+                                                           "armada-drm-fb",
+                                                           false);
+       if (ret) {
+               dev_err(dev, "[" DRM_NAME ":%s] can't kick out simple-fb: %d\n",
+                       __func__, ret);
+               kfree(priv);
+               return ret;
+       }
+
        priv->drm.dev_private = priv;
 
        dev_set_drvdata(dev, &priv->drm);