1 files changed, 37 insertions, 0 deletions
diff --git a/meta-amd-bsp/recipes-kernel/linux/linux-yocto-4.19.8/2474-drm-amd-display-Disconnect-DCN2-mpcc-when-changing-t.patch b/meta-amd-bsp/recipes-kernel/linux/linux-yocto-4.19.8/2474-drm-amd-display-Disconnect-DCN2-mpcc-when-changing-t.patch
new file mode 100644
index 00000000..b43d15ec
--- /dev/null
+++ b/meta-amd-bsp/recipes-kernel/linux/linux-yocto-4.19.8/2474-drm-amd-display-Disconnect-DCN2-mpcc-when-changing-t.patch
@@ -0,0 +1,37 @@
+From 43b57b2c5f29acf72a61a4bd742ee9a12770536a Mon Sep 17 00:00:00 2001
+From: Leo Li <sunpeng.li@amd.com>
+Date: Fri, 15 Mar 2019 13:50:26 -0400
+Subject: [PATCH 2474/2940] drm/amd/display: Disconnect DCN2 mpcc when changing
+ tg
+
+A previous fix was done for DCN1 that needed to be ported to DCN2:
+60c677534e73 ("drm/amd/display: Disconnect mpcc when changing tg")
+
+Signed-off-by: Leo Li <sunpeng.li@amd.com>
+Acked-by: Hawking Zhang <Hawking.Zhang@amd.com>
+Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
+---
+ drivers/gpu/drm/amd/display/dc/dcn20/dcn20_hwseq.c | 7 ++++---
+ 1 file changed, 4 insertions(+), 3 deletions(-)
+
+diff --git a/drivers/gpu/drm/amd/display/dc/dcn20/dcn20_hwseq.c b/drivers/gpu/drm/amd/display/dc/dcn20/dcn20_hwseq.c
+index f6e25f75a0a9..f2e5e4928119 100644
+--- a/drivers/gpu/drm/amd/display/dc/dcn20/dcn20_hwseq.c
++++ b/drivers/gpu/drm/amd/display/dc/dcn20/dcn20_hwseq.c
+@@ -1323,9 +1323,10 @@ static void dcn20_apply_ctx_for_surface(
+ 			}
+ 		}
+ 
+-		if (!pipe_ctx->plane_state &&
+-			old_pipe_ctx->plane_state &&
+-			old_pipe_ctx->stream_res.tg == tg) {
++		if ((!pipe_ctx->plane_state ||
++		     pipe_ctx->stream_res.tg != old_pipe_ctx->stream_res.tg) &&
++		     old_pipe_ctx->plane_state &&
++		     old_pipe_ctx->stream_res.tg == tg) {
+ 
+ 			dc->hwss.plane_atomic_disconnect(dc, old_pipe_ctx);
+ 			removed_pipe[i] = true;
+-- 
+2.17.1
+