Revert "drm/amd/display: Reset cached PSR parameters after hibernate"
authorEvgenii Krasnikov <Evgenii.Krasnikov@amd.com>
Wed, 20 Apr 2022 20:04:33 +0000 (16:04 -0400)
committerAlex Deucher <alexander.deucher@amd.com>
Wed, 4 May 2022 14:43:55 +0000 (10:43 -0400)
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 <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>
drivers/gpu/drm/amd/display/dc/core/dc_link.c

index 1eddf27..3d13ee3 100644 (file)
@@ -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);