[PATCH 3/8] Revert "drm/amd/display: Reset cached PSR parameters after hibernate"
Wayne Lin
Wayne.Lin at amd.com
Wed Apr 27 02:39:54 UTC 2022
From: Evgenii Krasnikov <Evgenii.Krasnikov at amd.com>
This reverts commit cee342f2d6a8b57ef8209720d5892d0ee22fd3c8.
Commit cee342f2d6a8 ("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 at amd.com>
Reviewed-by: Harry Vanzylldejong <Harry.Vanzylldejong at amd.com>
Acked-by: Wayne Lin <wayne.lin at amd.com>
Signed-off-by: Evgenii Krasnikov <Evgenii.Krasnikov at amd.com>
---
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);
--
2.36.0
More information about the amd-gfx
mailing list