Skip to content

Commit 7c220f8

Browse files
superm1gregkh
authored andcommitted
Revert "drm/amd: Keep display off while going into S4"
commit 7e7cb7a upstream. commit 68bfdc8 ("drm/amd: Keep display off while going into S4") attempted to keep displays off during the S4 sequence by not resuming display IP. This however leads to hangs because DRM clients such as the console can try to access registers and cause a hang. Closes: https://gitlab.freedesktop.org/drm/amd/-/issues/4155 Fixes: 68bfdc8 ("drm/amd: Keep display off while going into S4") Reviewed-by: Alex Deucher <[email protected]> Link: https://lore.kernel.org/r/[email protected] Signed-off-by: Mario Limonciello <[email protected]> Signed-off-by: Alex Deucher <[email protected]> (cherry picked from commit e485502) Cc: [email protected] Signed-off-by: Greg Kroah-Hartman <[email protected]>
1 parent b4f801e commit 7c220f8

File tree

1 file changed

+0
-5
lines changed

1 file changed

+0
-5
lines changed

drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -3315,11 +3315,6 @@ static int dm_resume(void *handle)
33153315

33163316
return 0;
33173317
}
3318-
3319-
/* leave display off for S4 sequence */
3320-
if (adev->in_s4)
3321-
return 0;
3322-
33233318
/* Recreate dc_state - DC invalidates it when setting power state to S3. */
33243319
dc_state_release(dm_state->context);
33253320
dm_state->context = dc_state_create(dm->dc, NULL);

0 commit comments

Comments
 (0)