From: Greg Kroah-Hartman Date: Sat, 24 May 2025 16:24:48 +0000 (+0200) Subject: 6.12-stable patches X-Git-Tag: v6.12.31~45 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=0af35b7fd26ef75ffe79cbaa11020f65b49d930b;p=thirdparty%2Fkernel%2Fstable-queue.git 6.12-stable patches added patches: revert-drm-amd-keep-display-off-while-going-into-s4.patch --- diff --git a/queue-6.12/revert-drm-amd-keep-display-off-while-going-into-s4.patch b/queue-6.12/revert-drm-amd-keep-display-off-while-going-into-s4.patch new file mode 100644 index 0000000000..6db4bcb760 --- /dev/null +++ b/queue-6.12/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 +@@ -3315,11 +3315,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_state_release(dm_state->context); + dm_state->context = dc_state_create(dm->dc, NULL); diff --git a/queue-6.12/series b/queue-6.12/series index 6f7f7f0179..3d152f6b37 100644 --- a/queue-6.12/series +++ b/queue-6.12/series @@ -598,3 +598,4 @@ drm-edid-fixed-the-bug-that-hdr-metadata-was-not-reset.patch smb-client-fix-use-after-free-in-cifs_fill_dirent.patch arm64-dts-marvell-udpu-define-pinctrl-state-for-alarm-leds.patch smb-client-reset-all-search-buffer-pointers-when-releasing-buffer.patch +revert-drm-amd-keep-display-off-while-going-into-s4.patch