drm/vc4: Kick out the simplefb framebuffer before we set up KMS.
If we don't, then simplefb stays loaded on /dev/fb0 even though scanout isn't happening from simplefb's memory area any more, and you end up with no console. Signed-off-by: Eric Anholt <eric@anholt.net> Acked-by: Dave Airlie <airlied@redhat.com>
This commit is contained in:
parent
f55532a0c0
commit
b3a15f6d55
@ -153,6 +153,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);
|
||||
@ -186,6 +204,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;
|
||||
|
Loading…
x
Reference in New Issue
Block a user