From: Eric Anholt Date: Fri, 16 Mar 2018 22:04:34 +0000 (-0700) Subject: drm/vc4: Add missing formats to vc4_format_mod_supported(). X-Git-Tag: v4.18.12~104 X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=e80225d36dca7c1897dc3b6107ee9ee87fafc9a4;p=users%2Fdwmw2%2Flinux.git drm/vc4: Add missing formats to vc4_format_mod_supported(). [ Upstream commit 1e871d65e375280757833d9fce91dda71980bdf5 ] Daniel's format_mod_supported() patch predated Dave's for NV21/61, and I didn't catch that when rebasing. This is a problem since the formats are now getting validated before being passed to the driver's atomic hooks. Signed-off-by: Eric Anholt Acked-by: Daniel Stone Cc: Dave Stevenson Fixes: 423ad7b3cbd1 ("drm/vc4: Advertise supported modifiers for planes") Link: https://patchwork.freedesktop.org/patch/msgid/20180316220435.31416-2-eric@anholt.net Signed-off-by: Sasha Levin Signed-off-by: Greg Kroah-Hartman --- diff --git a/drivers/gpu/drm/vc4/vc4_plane.c b/drivers/gpu/drm/vc4/vc4_plane.c index cf5aea1d64880..3363451b992b4 100644 --- a/drivers/gpu/drm/vc4/vc4_plane.c +++ b/drivers/gpu/drm/vc4/vc4_plane.c @@ -874,7 +874,9 @@ static bool vc4_format_mod_supported(struct drm_plane *plane, case DRM_FORMAT_YUV420: case DRM_FORMAT_YVU420: case DRM_FORMAT_NV12: + case DRM_FORMAT_NV21: case DRM_FORMAT_NV16: + case DRM_FORMAT_NV61: default: return (modifier == DRM_FORMAT_MOD_LINEAR); }