Revert "drm/amd/display: Reset cached PSR parameters after hibernate"

This reverts commit bcd8fd3c96f32ebaf3ae2c4b2d50153f71e8d190.

Commit bcd8fd3c96f3 ("drm/amd/display: Reset cached PSR parameters after hibernate")
causes a system hang when game resolution is changed. Revert it.

Reviewed-by: Jayendran Ramani <Jayendran.Ramani@amd.com>
Reviewed-by: Harry Vanzylldejong <Harry.Vanzylldejong@amd.com>
Acked-by: Wayne Lin <wayne.lin@amd.com>
Signed-off-by: Evgenii Krasnikov <Evgenii.Krasnikov@amd.com>
Tested-by: Daniel Wheeler <daniel.wheeler@amd.com>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>

diff --git a/drivers/gpu/drm/amd/display/dc/core/dc_link.c b/drivers/gpu/drm/amd/display/dc/core/dc_link.c
index 1eddf2785153e4809a36d28d49bcdbd22d1a5b0c..3d13ee32a3dbfb597ae0e2169a511bee20cc544d 100644 (file)
--- a/drivers/gpu/drm/amd/display/dc/core/dc_link.c
+++ b/drivers/gpu/drm/amd/display/dc/core/dc_link.c
@@ -3317,14 +3317,9 @@ bool dc_link_setup_psr(struct dc_link *link,
         */
        psr_context->frame_delay = 0;
 
-       if (psr) {
+       if (psr)
                link->psr_settings.psr_feature_enabled = psr->funcs->psr_copy_settings(psr,
                        link, psr_context, panel_inst);
-               if (link->psr_settings.psr_feature_enabled) {
-                       link->psr_settings.psr_power_opt = 0;
-                       link->psr_settings.psr_allow_active = 0;
-               }
-       }
        else
                link->psr_settings.psr_feature_enabled = dmcu->funcs->setup_psr(dmcu, link, psr_context);