target/linux/bcm27xx/patches-5.4/950-0618-drm-vc4-Fixup-plane-init-within-firmware-kms.patch

   1 From d39fee7763d49f3b0bfd57e6cdc014467415d56a Mon Sep 17 00:00:00 2001
   2 From: Dave Stevenson <dave.stevenson@raspberrypi.com>
   3 Date: Mon, 30 Mar 2020 18:25:10 +0100
   4 Subject: [PATCH] drm/vc4: Fixup plane init within firmware-kms
   5
   6 "drm/vc4: plane: Move additional planes creation to driver" moved
   7 overlay and cursor plane creation to a global function thata was
   8 unconditionally run, when it is not wanted in firmware KMS mode.
   9
  10 Signed-off-by: Dave Stevenson <dave.stevenson@raspberrypi.com>
  11 ---
  12  drivers/gpu/drm/vc4/vc4_drv.c | 8 +++++---
  13  1 file changed, 5 insertions(+), 3 deletions(-)
  14
  15 --- a/drivers/gpu/drm/vc4/vc4_drv.c
  16 +++ b/drivers/gpu/drm/vc4/vc4_drv.c
  17 @@ -291,9 +291,11 @@ static int vc4_drm_bind(struct device *d
  18         if (ret)
  19                 goto gem_destroy;
  20
  21 -       ret = vc4_plane_create_additional_planes(drm);
  22 -       if (ret)
  23 -               goto unbind_all;
  24 +       if (!vc4->firmware_kms) {
  25 +               ret = vc4_plane_create_additional_planes(drm);
  26 +               if (ret)
  27 +                       goto unbind_all;
  28 +       }
  29
  30         drm_fb_helper_remove_conflicting_framebuffers(NULL, "vc4drmfb", false);
  31