Bug#1107511: linux-image-6.1.0-37-amd64: Resume from supsend-to-disk fails
Hi Klaus,
On Wed, Jun 18, 2025 at 07:54:55PM +0200, Klaus Singvogel wrote:
> Hello Salvatore,
>
> Klaus Singvogel wrote:
> > >
> > > dpkg -i linux-image-6.15-amd64_6.15.2-1~exp1_amd64.deb
> > >
> >
> > Thanks.
> >
> > The first installation was aborted, due to the wrong version of linux-base (>= 4.12 was required, but 4.9 was installed).
> >
> > But after installing linux-base_4.12~bpo12+1_all.deb, the linux kernel 6.15.2 was successfully installed. Yippie.
> >
> > The issue doesn't occur in kernel 6.15.2.
>
> Upstream suggests testing kernel version 6.1.141.
> https://gitlab.freedesktop.org/drm/amd/-/issues/4330
>
> Mario thinks that this missing patch might be the cause of the issue:
> https://git.kernel.org/torvalds/c/7e7cb7a13c81
> Is the 6.1.141 kernel available as a Debian package anywhere, like
> the 6.15.2 experimental version?
No not yet, as it is yet in preparation.
I can do two things for you, 1. provide the 6.1.141 based test package
version and both a test version with only
7e7cb7a13c81073d38a10fa7b450d23712281ec4 applied to confirm that is
the isolated fix.
will come back to you when it's ready to test. Alterantively you can
do the following, with the attached patch (which is the mentioned
commit, follow
https://kernel-team.pages.debian.net/kernel-handbook/ch-common-tasks.html#id-1.6.6.4
which uses a helper script to make test packages using single patches
on top quite handy/easy.
Regards,
Salvatore
>From 9c40d1f7b75fc93d7ef02acc3a2a712cb057e576 Mon Sep 17 00:00:00 2001
From: Mario Limonciello <mario.limonciello@amd.com>
Date: Thu, 22 May 2025 09:13:28 -0500
Subject: [PATCH] Revert "drm/amd: Keep display off while going into S4"
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(-)
diff --git a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c
index 998dde73ecc6..64f626cc7913 100644
--- 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);
--
2.50.0
Reply to: