target/linux/bcm27xx/patches-5.4/950-0256-drm-vc4-Correct-SAND-support-for-FKMS.patch

   1 From 46c612d0248ba6e0c8c236cf1839b0c2ccecee01 Mon Sep 17 00:00:00 2001
   2 From: Dave Stevenson <dave.stevenson@raspberrypi.org>
   3 Date: Wed, 29 May 2019 15:44:11 +0100
   4 Subject: [PATCH] drm/vc4: Correct SAND support for FKMS.
   5
   6 It was accepting NV21 which doesn't map through, but
   7 also wasn't advertising the modifier so nothing would know
   8 to request it.
   9
  10 Signed-off-by: Dave Stevenson <dave.stevenson@raspberrypi.org>
  11 ---
  12  drivers/gpu/drm/vc4/vc4_firmware_kms.c | 3 ++-
  13  1 file changed, 2 insertions(+), 1 deletion(-)
  14
  15 --- a/drivers/gpu/drm/vc4/vc4_firmware_kms.c
  16 +++ b/drivers/gpu/drm/vc4/vc4_firmware_kms.c
  17 @@ -546,7 +546,6 @@ static bool vc4_fkms_format_mod_supporte
  18                         return false;
  19                 }
  20         case DRM_FORMAT_NV12:
  21 -       case DRM_FORMAT_NV21:
  22                 switch (fourcc_mod_broadcom_mod(modifier)) {
  23                 case DRM_FORMAT_MOD_LINEAR:
  24                 case DRM_FORMAT_MOD_BROADCOM_SAND128:
  25 @@ -554,6 +553,7 @@ static bool vc4_fkms_format_mod_supporte
  26                 default:
  27                         return false;
  28                 }
  29 +       case DRM_FORMAT_NV21:
  30         case DRM_FORMAT_RGB888:
  31         case DRM_FORMAT_BGR888:
  32         case DRM_FORMAT_YUV422:
  33 @@ -600,6 +600,7 @@ static struct drm_plane *vc4_fkms_plane_
  34                  * would prefer to scan out linear (less bus traffic).
  35                  */
  36                 DRM_FORMAT_MOD_BROADCOM_VC4_T_TILED,
  37 +               DRM_FORMAT_MOD_BROADCOM_SAND128,
  38                 DRM_FORMAT_MOD_INVALID,
  39         };
  40         int i;