Skip to content

Commit a0322e7

Browse files
superm1smb49
authored andcommitted
Revert "drm/amd: Keep display off while going into S4"
BugLink: https://bugs.launchpad.net/bugs/2115678 BugLink: https://bugs.launchpad.net/bugs/2121449 commit 7e7cb7a13c81073d38a10fa7b450d23712281ec4 upstream. commit 68bfdc8dc0a1a ("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: 68bfdc8dc0a1a ("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> (cherry picked from commit e485502c37b097b0bd773baa7e2741bf7bd2909a) Cc: stable@vger.kernel.org Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> Signed-off-by: Manuel Diewald <manuel.diewald@canonical.com> Signed-off-by: Mehmet Basaran <mehmet.basaran@canonical.com>
1 parent d78403d commit a0322e7

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
@@ -3402,11 +3402,6 @@ static int dm_resume(struct amdgpu_ip_block *ip_block)
34023402

34033403
return 0;
34043404
}
3405-
3406-
/* leave display off for S4 sequence */
3407-
if (adev->in_s4)
3408-
return 0;
3409-
34103405
/* Recreate dc_state - DC invalidates it when setting power state to S3. */
34113406
dc_state_release(dm_state->context);
34123407
dm_state->context = dc_state_create(dm->dc, NULL);

0 commit comments

Comments
 (0)