| 1234567891011121314151617181920212223242526272829303132333435363738394041424344454647484950515253 |
- From b7f009c01e2e55df7286a7de67f41846dc2536a6 Mon Sep 17 00:00:00 2001
- From: Eric Anholt <eric@anholt.net>
- Date: Tue, 19 Apr 2016 13:24:14 -0700
- Subject: [PATCH 337/381] 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>
- (cherry picked from commit b3a15f6d55fb584dd4d8baac5d1b6a398720620c)
- ---
- drivers/gpu/drm/vc4/vc4_drv.c | 20 ++++++++++++++++++++
- 1 file changed, 20 insertions(+)
- --- a/drivers/gpu/drm/vc4/vc4_drv.c
- +++ b/drivers/gpu/drm/vc4/vc4_drv.c
- @@ -164,6 +164,24 @@ static void vc4_match_add_drivers(struct
- }
- }
-
- +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);
- @@ -208,6 +226,8 @@ static int vc4_drm_bind(struct device *d
- if (ret)
- goto gem_destroy;
-
- + vc4_kick_out_firmware_fb();
- +
- ret = drm_dev_register(drm, 0);
- if (ret < 0)
- goto unbind_all;
|
