From eaacf13b33eca727349575c7a0edc39379c9d47e Mon Sep 17 00:00:00 2001 From: Evgenii Krasnikov Date: Wed, 20 Apr 2022 16:04:33 -0400 Subject: [PATCH] Revert "drm/amd/display: Reset cached PSR parameters after hibernate" This reverts commit d2069326d26c7de78e77a060fb6e6d0d21c35dbd. Commit d2069326d26c ("drm/amd/display: Reset cached PSR parameters after hibernate") causes a system hang when game resolution is changed. Revert it. Reviewed-by: Jayendran Ramani Reviewed-by: Harry Vanzylldejong Acked-by: Wayne Lin Signed-off-by: Evgenii Krasnikov Tested-by: Daniel Wheeler Signed-off-by: Alex Deucher --- drivers/gpu/drm/amd/display/dc/core/dc_link.c | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) 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 1eddf2785153..3d13ee32a3db 100644 --- 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);