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>

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 f663adb335849746af6c420d69cb424684c30bb5..48e21ead3142d44c59ec41fbe5472618cc16cc84 100644 (file)
--- a/drivers/gpu/drm/amd/display/dc/dce/dce_dmcu.c
+++ b/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)
                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,