Merge tag 'topic/drm-misc-2016-06-01' of git://anongit.freedesktop.org/drm-intel...

[cascardo/linux.git] / drivers / gpu / drm / vc4 / vc4_drv.c

diff --git a/drivers/gpu/drm/vc4/vc4_drv.c b/drivers/gpu/drm/vc4/vc4_drv.c
index b662d04..58b8fc0 100644 (file)
--- a/drivers/gpu/drm/vc4/vc4_drv.c
+++ b/drivers/gpu/drm/vc4/vc4_drv.c
@@ -154,6 +154,24 @@ static void vc4_match_add_drivers(struct device *dev,
        }
 }
 
+static void vc4_kick_out_firmware_fb(void)
+{
+       struct apertures_struct *ap;
+
+       ap = alloc_apertures(1);
+       if (!ap)
+               return;
+
+       /* Since VC4 is a UMA device, the simplefb node may have been
+        * located anywhere in memory.
+        */
+       ap->ranges[0].base = 0;
+       ap->ranges[0].size = ~0;
+
+       remove_conflicting_framebuffers(ap, "vc4drmfb", false);
+       kfree(ap);
+}
+
 static int vc4_drm_bind(struct device *dev)
 {
        struct platform_device *pdev = to_platform_device(dev);
@@ -187,6 +205,8 @@ static int vc4_drm_bind(struct device *dev)
        if (ret)
                goto gem_destroy;
 
+       vc4_kick_out_firmware_fb();
+
        ret = drm_dev_register(drm, 0);
        if (ret < 0)
                goto unbind_all;