target/linux/brcm2708/patches-4.4/0334-drm-vc4-Kick-out-the-simplefb-framebuffer-before-we-.patch

   1 From d8bb97aba2a3d6c946b7c176370a71d117dee52c Mon Sep 17 00:00:00 2001
   2 From: Eric Anholt <eric@anholt.net>
   3 Date: Tue, 19 Apr 2016 13:24:14 -0700
   4 Subject: [PATCH 334/423] drm/vc4: Kick out the simplefb framebuffer before we
   5  set up KMS.
   6
   7 If we don't, then simplefb stays loaded on /dev/fb0 even though
   8 scanout isn't happening from simplefb's memory area any more, and you
   9 end up with no console.
  10
  11 Signed-off-by: Eric Anholt <eric@anholt.net>
  12 Acked-by: Dave Airlie <airlied@redhat.com>
  13 (cherry picked from commit b3a15f6d55fb584dd4d8baac5d1b6a398720620c)
  14 ---
  15  drivers/gpu/drm/vc4/vc4_drv.c | 20 ++++++++++++++++++++
  16  1 file changed, 20 insertions(+)
  17
  18 --- a/drivers/gpu/drm/vc4/vc4_drv.c
  19 +++ b/drivers/gpu/drm/vc4/vc4_drv.c
  20 @@ -164,6 +164,24 @@ static void vc4_match_add_drivers(struct
  21         }
  22  }
  23
  24 +static void vc4_kick_out_firmware_fb(void)
  25 +{
  26 +       struct apertures_struct *ap;
  27 +
  28 +       ap = alloc_apertures(1);
  29 +       if (!ap)
  30 +               return;
  31 +
  32 +       /* Since VC4 is a UMA device, the simplefb node may have been
  33 +        * located anywhere in memory.
  34 +        */
  35 +       ap->ranges[0].base = 0;
  36 +       ap->ranges[0].size = ~0;
  37 +
  38 +       remove_conflicting_framebuffers(ap, "vc4drmfb", false);
  39 +       kfree(ap);
  40 +}
  41 +
  42  static int vc4_drm_bind(struct device *dev)
  43  {
  44         struct platform_device *pdev = to_platform_device(dev);
  45 @@ -208,6 +226,8 @@ static int vc4_drm_bind(struct device *d
  46         if (ret)
  47                 goto gem_destroy;
  48
  49 +       vc4_kick_out_firmware_fb();
  50 +
  51         ret = drm_dev_register(drm, 0);
  52         if (ret < 0)
  53                 goto unbind_all;