6.1-stable patches

added patches:
	revert-drm-amd-keep-display-off-while-going-into-s4.patch

diff --git a/queue-6.1/revert-drm-amd-keep-display-off-while-going-into-s4.patch b/queue-6.1/revert-drm-amd-keep-display-off-while-going-into-s4.patch
new file mode 100644 (file)
index 0000000..c8c83d3
--- /dev/null
+++ b/queue-6.1/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 <mario.limonciello@amd.com>
+Date: Thu, 22 May 2025 09:13:28 -0500
+Subject: Revert "drm/amd: Keep display off while going into S4"
+
+From: Mario Limonciello <mario.limonciello@amd.com>
+
+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>
+---
+ 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
+@@ -2897,11 +2897,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-6.1/series b/queue-6.1/series
index f6fa861741ce9c957508aff26f62ad614d966e51..a46a0087aa8e31ceeadb52018d741f3755175bb7 100644 (file)
--- a/queue-6.1/series
+++ b/queue-6.1/series
@@ -262,3 +262,4 @@ platform-x86-dell-wmi-sysman-avoid-buffer-overflow-in-current_password_store.pat
 drm-edid-fixed-the-bug-that-hdr-metadata-was-not-reset.patch
 smb-client-fix-use-after-free-in-cifs_fill_dirent.patch
 smb-client-reset-all-search-buffer-pointers-when-releasing-buffer.patch
+revert-drm-amd-keep-display-off-while-going-into-s4.patch