git.openwrt.org Git - openwrt/staging/stintel.git/blob

   1 From 89c8ca8b57abe798418bd6544b0fac9aa87cb691 Mon Sep 17 00:00:00 2001
   2 From: Maxime Ripard <maxime@cerno.tech>
   3 Date: Fri, 25 Jun 2021 17:01:33 +0200
   4 Subject: [PATCH] drm/vc4: Remove conflicting framebuffers before
   5  callind bind_all
   6
   7 The bind hooks will modify their controller registers, so simplefb is
   8 going to be unusable anyway. Let's avoid any transient state where it
   9 could still be in the system but no longer functionnal.
  10
  11 Signed-off-by: Maxime Ripard <maxime@cerno.tech>
  12 ---
  13  drivers/gpu/drm/vc4/vc4_drv.c | 4 ++--
  14  1 file changed, 2 insertions(+), 2 deletions(-)
  15
  16 --- a/drivers/gpu/drm/vc4/vc4_drv.c
  17 +++ b/drivers/gpu/drm/vc4/vc4_drv.c
  18 @@ -305,6 +305,8 @@ static int vc4_drm_bind(struct device *d
  19         if (ret)
  20                 return ret;
  21
  22 +       drm_fb_helper_remove_conflicting_framebuffers(NULL, "vc4drmfb", false);
  23 +
  24         ret = component_bind_all(dev, drm);
  25         if (ret)
  26                 return ret;
  27 @@ -315,8 +317,6 @@ static int vc4_drm_bind(struct device *d
  28                         goto unbind_all;
  29         }
  30
  31 -       drm_fb_helper_remove_conflicting_framebuffers(NULL, "vc4drmfb", false);
  32 -
  33         ret = vc4_kms_load(drm);
  34         if (ret < 0)
  35                 goto unbind_all;