From 70e07b16886b3cc75056a73f19a2eb751def0d12 Mon Sep 17 00:00:00 2001 From: Greg Kroah-Hartman Date: Sat, 24 May 2025 18:24:16 +0200 Subject: [PATCH] 5.15-stable patches added patches: revert-drm-amd-keep-display-off-while-going-into-s4.patch --- ...keep-display-off-while-going-into-s4.patch | 41 +++++++++++++++++++ queue-5.15/series | 1 + 2 files changed, 42 insertions(+) create mode 100644 queue-5.15/revert-drm-amd-keep-display-off-while-going-into-s4.patch diff --git a/queue-5.15/revert-drm-amd-keep-display-off-while-going-into-s4.patch b/queue-5.15/revert-drm-amd-keep-display-off-while-going-into-s4.patch new file mode 100644 index 0000000000..5b173de089 --- /dev/null +++ b/queue-5.15/revert-drm-amd-keep-display-off-while-going-into-s4.patch @@ -0,0 +1,41 @@ +From 7e7cb7a13c81073d38a10fa7b450d23712281ec4 Mon Sep 17 00:00:00 2001 +From: Mario Limonciello +Date: Thu, 22 May 2025 09:13:28 -0500 +Subject: Revert "drm/amd: Keep display off while going into S4" + +From: Mario Limonciello + +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 +Link: https://lore.kernel.org/r/20250522141328.115095-1-mario.limonciello@amd.com +Signed-off-by: Mario Limonciello +Signed-off-by: Alex Deucher +(cherry picked from commit e485502c37b097b0bd773baa7e2741bf7bd2909a) +Cc: stable@vger.kernel.org +Signed-off-by: Greg Kroah-Hartman +--- + drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c | 5 ----- + 1 file changed, 5 deletions(-) + +--- a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c ++++ b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c +@@ -2710,11 +2710,6 @@ static int dm_resume(void *handle) + + return 0; + } +- +- /* leave display off for S4 sequence */ +- if (adev->in_s4) +- return 0; +- + /* Recreate dc_state - DC invalidates it when setting power state to S3. */ + dc_release_state(dm_state->context); + dm_state->context = dc_create_state(dm->dc); diff --git a/queue-5.15/series b/queue-5.15/series index 7cfc5c271d..b9e434f846 100644 --- a/queue-5.15/series +++ b/queue-5.15/series @@ -177,3 +177,4 @@ alsa-pcm-fix-race-of-buffer-access-at-pcm-oss-layer.patch llc-fix-data-loss-when-reading-from-a-socket-in-llc_ui_recvmsg.patch platform-x86-dell-wmi-sysman-avoid-buffer-overflow-in-current_password_store.patch drm-edid-fixed-the-bug-that-hdr-metadata-was-not-reset.patch +revert-drm-amd-keep-display-off-while-going-into-s4.patch -- 2.47.2