Browse Source

drm/amd/display: disablePSR in UpdatePlanes in PassiveLevel

Signed-off-by: Charlene Liu <charlene.liu@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>
Charlene Liu 7 years ago
parent
commit
c4bd27ac1a
1 changed files with 3 additions and 0 deletions
  1. 3 0
      drivers/gpu/drm/amd/display/dc/dce/dce_dmcu.c

+ 3 - 0
drivers/gpu/drm/amd/display/dc/dce/dce_dmcu.c

@@ -521,6 +521,9 @@ static void dcn10_dmcu_set_psr_enable(struct dmcu *dmcu, bool enable, bool wait)
 	if (dmcu->dmcu_state != DMCU_RUNNING)
 	if (dmcu->dmcu_state != DMCU_RUNNING)
 		return;
 		return;
 
 
+	dcn10_get_dmcu_psr_state(dmcu, &psr_state);
+	if (psr_state == 0 && !enable)
+		return;
 	/* waitDMCUReadyForCmd */
 	/* waitDMCUReadyForCmd */
 	REG_WAIT(MASTER_COMM_CNTL_REG, MASTER_COMM_INTERRUPT, 0,
 	REG_WAIT(MASTER_COMM_CNTL_REG, MASTER_COMM_INTERRUPT, 0,
 				dmcu_wait_reg_ready_interval,
 				dmcu_wait_reg_ready_interval,