1 files changed, 39 insertions, 0 deletions
diff --git a/meta-amd-bsp/recipes-kernel/linux-5.4/linux-yocto-5.4.2/1384-drm-amd-display-remove-psr-state-condition-when-psr-.patch b/meta-amd-bsp/recipes-kernel/linux-5.4/linux-yocto-5.4.2/1384-drm-amd-display-remove-psr-state-condition-when-psr-.patch
new file mode 100644
index 00000000..bffce0f1
--- /dev/null
+++ b/meta-amd-bsp/recipes-kernel/linux-5.4/linux-yocto-5.4.2/1384-drm-amd-display-remove-psr-state-condition-when-psr-.patch
@@ -0,0 +1,39 @@
+From 632a1524a0307f5e421278fa7ba1c73c4f665163 Mon Sep 17 00:00:00 2001
+From: Lewis Huang <Lewis.Huang@amd.com>
+Date: Fri, 20 Dec 2019 14:17:54 +0800
+Subject: [PATCH 1384/1453] drm/amd/display: remove psr state condition when
+ psr exit case
+
+[Why]
+DMCU need to wait a vblank to handle psr enter command. When psr exit
+coming before vblank, the psr exit command will be skip because current
+psr state is disable.
+
+[How]
+remove psr state condition when psr exit case
+
+Signed-off-by: Lewis Huang <Lewis.Huang@amd.com>
+Reviewed-by: Tony Cheng <Tony.Cheng@amd.com>
+Acked-by: Harry Wentland <harry.wentland@amd.com>
+Acked-by: Rodrigo Siqueira <Rodrigo.Siqueira@amd.com>
+---
+ drivers/gpu/drm/amd/display/dc/dce/dce_dmcu.c | 3 ---
+ 1 file changed, 3 deletions(-)
+
+diff --git a/drivers/gpu/drm/amd/display/dc/dce/dce_dmcu.c b/drivers/gpu/drm/amd/display/dc/dce/dce_dmcu.c
+index 4144b1055db2..978a64e2c314 100644
+--- a/drivers/gpu/drm/amd/display/dc/dce/dce_dmcu.c
++++ b/drivers/gpu/drm/amd/display/dc/dce/dce_dmcu.c
+@@ -539,9 +539,6 @@ static void dcn10_dmcu_set_psr_enable(struct dmcu *dmcu, bool enable, bool wait)
+ 	if (dmcu->dmcu_state != DMCU_RUNNING)
+ 		return;
+ 
+-	dcn10_get_dmcu_psr_state(dmcu, &psr_state);
+-	if (psr_state == 0 && !enable)
+-		return;
+ 	/* waitDMCUReadyForCmd */
+ 	REG_WAIT(MASTER_COMM_CNTL_REG, MASTER_COMM_INTERRUPT, 0,
+ 				dmcu_wait_reg_ready_interval,
+-- 
+2.17.1
+