1 files changed, 39 insertions, 0 deletions
diff --git a/meta-amd-bsp/recipes-kernel/linux/linux-yocto-4.14.71/3698-drm-amd-display-validate-plane-format-on-primary-pla.patch b/meta-amd-bsp/recipes-kernel/linux/linux-yocto-4.14.71/3698-drm-amd-display-validate-plane-format-on-primary-pla.patch
new file mode 100644
index 00000000..2caec229
--- /dev/null
+++ b/meta-amd-bsp/recipes-kernel/linux/linux-yocto-4.14.71/3698-drm-amd-display-validate-plane-format-on-primary-pla.patch
@@ -0,0 +1,39 @@
+From da38ac38102917bb1b77b92e38126317a1d85ec4 Mon Sep 17 00:00:00 2001
+From: Shirish S <shirish.s@amd.com>
+Date: Wed, 7 Mar 2018 12:36:11 +0530
+Subject: [PATCH 3698/4131] drm/amd/display: validate plane format on primary
+ plane
+
+In dce110, the plane configuration is such that plane 0
+or the primary plane should be rendered with only RGB data.
+
+This patch adds the validation to ensure that no video data
+is rendered on plane 0.
+
+Signed-off-by: Shirish S <shirish.s@amd.com>
+Reviewed-by: Tony Cheng <Tony.Cheng@amd.com>
+---
+ drivers/gpu/drm/amd/display/dc/dce110/dce110_resource.c | 7 +++++++
+ 1 file changed, 7 insertions(+)
+
+diff --git a/drivers/gpu/drm/amd/display/dc/dce110/dce110_resource.c b/drivers/gpu/drm/amd/display/dc/dce110/dce110_resource.c
+index 830cbbc..b1f14be 100644
+--- a/drivers/gpu/drm/amd/display/dc/dce110/dce110_resource.c
++++ b/drivers/gpu/drm/amd/display/dc/dce110/dce110_resource.c
+@@ -879,6 +879,13 @@ static bool dce110_validate_surface_sets(
+ 					plane->src_rect.height > 1080))
+ 					return false;
+ 
++				/* we don't have the logic to support underlay
++				 * only yet so block the use case where we get
++				 * NV12 plane as top layer
++				 */
++				if (j == 0)
++					return false;
++
+ 				/* irrespective of plane format,
+ 				 * stream should be RGB encoded
+ 				 */
+-- 
+2.7.4
+