1 files changed, 41 insertions, 0 deletions
diff --git a/meta-amd-bsp/recipes-kernel/linux/linux-yocto-4.14.71/2747-drm-amd-display-Early-return-on-stream-programming-f.patch b/meta-amd-bsp/recipes-kernel/linux/linux-yocto-4.14.71/2747-drm-amd-display-Early-return-on-stream-programming-f.patch
new file mode 100644
index 00000000..012992c3
--- /dev/null
+++ b/meta-amd-bsp/recipes-kernel/linux/linux-yocto-4.14.71/2747-drm-amd-display-Early-return-on-stream-programming-f.patch
@@ -0,0 +1,41 @@
+From 011b22e4ce10425b0e65474e5b3035e20204e0bc Mon Sep 17 00:00:00 2001
+From: "Leo (Sunpeng) Li" <sunpeng.li@amd.com>
+Date: Tue, 7 Nov 2017 15:54:58 -0500
+Subject: [PATCH 2747/4131] drm/amd/display: Early return on stream programming
+ failure
+
+The fail goto is incorrect. It will incorrectly release the dc_states on
+stream programming failure.
+
+Signed-off-by: Leo (Sunpeng) Li <sunpeng.li@amd.com>
+Reviewed-by: Tony Cheng <Tony.Cheng@amd.com>
+Acked-by: Harry Wentland <harry.wentland@amd.com>
+Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
+---
+ drivers/gpu/drm/amd/display/dc/core/dc.c | 3 +--
+ 1 file changed, 1 insertion(+), 2 deletions(-)
+
+diff --git a/drivers/gpu/drm/amd/display/dc/core/dc.c b/drivers/gpu/drm/amd/display/dc/core/dc.c
+index 9a30dc0..301c790 100644
+--- a/drivers/gpu/drm/amd/display/dc/core/dc.c
++++ b/drivers/gpu/drm/amd/display/dc/core/dc.c
+@@ -858,7 +858,7 @@ static enum dc_status dc_commit_state_no_check(struct dc *dc, struct dc_state *c
+ 	result = dc->hwss.apply_ctx_to_hw(dc, context);
+ 
+ 	if (result != DC_OK)
+-		goto fail;
++		return result;
+ 
+ 	if (context->stream_count > 1) {
+ 		enable_timing_multisync(dc, context);
+@@ -899,7 +899,6 @@ static enum dc_status dc_commit_state_no_check(struct dc *dc, struct dc_state *c
+ 				context->streams[i]->timing.pix_clk_khz);
+ 	}
+ 
+-fail:
+ 	dc_enable_stereo(dc, context, dc_streams, context->stream_count);
+ 
+ 	dc_release_state(dc->current_state);
+-- 
+2.7.4
+