1 files changed, 40 insertions, 0 deletions
diff --git a/meta-amd-bsp/recipes-kernel/linux/linux-yocto-4.14.71/2496-drm-amd-display-Early-return-when-turn-off-a-plane.patch b/meta-amd-bsp/recipes-kernel/linux/linux-yocto-4.14.71/2496-drm-amd-display-Early-return-when-turn-off-a-plane.patch
new file mode 100644
index 00000000..b8400351
--- /dev/null
+++ b/meta-amd-bsp/recipes-kernel/linux/linux-yocto-4.14.71/2496-drm-amd-display-Early-return-when-turn-off-a-plane.patch
@@ -0,0 +1,40 @@
+From abc56d3e282f01ceeb9e8a24293707bdd43a6048 Mon Sep 17 00:00:00 2001
+From: Yongqiang Sun <yongqiang.sun@amd.com>
+Date: Fri, 22 Sep 2017 13:41:13 -0400
+Subject: [PATCH 2496/4131] drm/amd/display: Early return when turn off a
+ plane.
+
+In case of two monitor connected and turn off one of the monitors,
+OTG0 is locked after graphic plane off due to redundant programming
+front end regs.
+
+Signed-off-by: Yongqiang Sun <yongqiang.sun@amd.com>
+Reviewed-by: Tony Cheng <Tony.Cheng@amd.com>
+Acked-by: Harry Wentland <Harry.Wentland@amd.com>
+---
+ drivers/gpu/drm/amd/display/dc/core/dc.c | 8 +++++++-
+ 1 file changed, 7 insertions(+), 1 deletion(-)
+
+diff --git a/drivers/gpu/drm/amd/display/dc/core/dc.c b/drivers/gpu/drm/amd/display/dc/core/dc.c
+index 17abfdd..03cb200 100644
+--- a/drivers/gpu/drm/amd/display/dc/core/dc.c
++++ b/drivers/gpu/drm/amd/display/dc/core/dc.c
+@@ -1190,8 +1190,14 @@ static void commit_planes_for_stream(struct dc *dc,
+ 		}
+ 	}
+ 
+-	if (surface_count == 0)
++	if (surface_count == 0) {
++		/*
++		 * In case of turning off screen, no need to program front end a second time.
++		 * just return after program front end.
++		 */
+ 		dc->hwss.apply_ctx_for_surface(dc, stream, surface_count, context);
++		return;
++	}
+ 
+ 	/* Lock pipes for provided surfaces, or all active if full update*/
+ 	for (i = 0; i < surface_count; i++) {
+-- 
+2.7.4
+