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

   1 From 0360325765bee2f76e11d42abf8e601320054230 Mon Sep 17 00:00:00 2001
   2 From: Eric Anholt <eric@anholt.net>
   3 Date: Fri, 16 Mar 2018 15:04:34 -0700
   4 Subject: [PATCH 356/454] drm/vc4: Add missing formats to
   5  vc4_format_mod_supported().
   6
   7 Daniel's format_mod_supported() patch predated Dave's for NV21/61, and
   8 I didn't catch that when rebasing.  This is a problem since the
   9 formats are now getting validated before being passed to the driver's
  10 atomic hooks.
  11
  12 Signed-off-by: Eric Anholt <eric@anholt.net>
  13 Acked-by: Daniel Stone <daniels@collabora.com>
  14 Cc: Dave Stevenson <dave.stevenson@raspberrypi.org>
  15 Fixes: 423ad7b3cbd1 ("drm/vc4: Advertise supported modifiers for planes")
  16 Link: https://patchwork.freedesktop.org/patch/msgid/20180316220435.31416-2-eric@anholt.net
  17 (cherry picked from commit 1e871d65e375280757833d9fce91dda71980bdf5)
  18 ---
  19  drivers/gpu/drm/vc4/vc4_plane.c | 2 ++
  20  1 file changed, 2 insertions(+)
  21
  22 --- a/drivers/gpu/drm/vc4/vc4_plane.c
  23 +++ b/drivers/gpu/drm/vc4/vc4_plane.c
  24 @@ -887,7 +887,9 @@ static bool vc4_format_mod_supported(str
  25         case DRM_FORMAT_YUV420:
  26         case DRM_FORMAT_YVU420:
  27         case DRM_FORMAT_NV12:
  28 +       case DRM_FORMAT_NV21:
  29         case DRM_FORMAT_NV16:
  30 +       case DRM_FORMAT_NV61:
  31         default:
  32                 return (modifier == DRM_FORMAT_MOD_LINEAR);
  33         }