Skip to content

Commit e485502

Browse files
superm1alexdeucher
authored andcommitted
Revert "drm/amd: Keep display off while going into S4"
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 <alexander.deucher@amd.com> Link: https://lore.kernel.org/r/20250522141328.115095-1-mario.limonciello@amd.com Signed-off-by: Mario Limonciello <mario.limonciello@amd.com> Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
1 parent 42f520f commit e485502

1 file changed

Lines changed: 0 additions & 5 deletions

File tree

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

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -3383,11 +3383,6 @@ static int dm_resume(struct amdgpu_ip_block *ip_block)
33833383

33843384
return 0;
33853385
}
3386-
3387-
/* leave display off for S4 sequence */
3388-
if (adev->in_s4)
3389-
return 0;
3390-
33913386
/* Recreate dc_state - DC invalidates it when setting power state to S3. */
33923387
dc_state_release(dm_state->context);
33933388
dm_state->context = dc_state_create(dm->dc, NULL);

0 commit comments

Comments
 (0)