]> git.ipfire.org Git - thirdparty/kernel/stable.git/commit
drm/amd: Fix hybrid sleep
authorMario Limonciello (AMD) <superm1@kernel.org>
Thu, 25 Sep 2025 18:51:08 +0000 (13:51 -0500)
committerRafael J. Wysocki <rafael.j.wysocki@intel.com>
Thu, 25 Sep 2025 19:37:38 +0000 (21:37 +0200)
commit0a6e9e098fcc318fec0f45a05a5c4743a81a60d9
treedb7c4459c0eb80d4387b7771ee67ddf68a55cfbb
parent495c8d35035edb66e3284113bef01f3b1b843832
drm/amd: Fix hybrid sleep

[Why]
commit 530694f54dd5e ("drm/amdgpu: do not resume device in thaw for
normal hibernation") optimized the flow for systems that are going
into S4 where the power would be turned off.  Basically the thaw()
callback wouldn't resume the device if the hibernation image was
successfully created since the system would be powered off.

This however isn't the correct flow for a system entering into
s0i3 after the hibernation image is created.  Some of the amdgpu
callbacks have different behavior depending upon the intended
state of the suspend.

[How]
Use pm_hibernation_mode_is_suspend() as an input to decide whether
to run resume during thaw() callback.

Reported-by: Ionut Nechita <ionut_n2001@yahoo.com>
Closes: https://gitlab.freedesktop.org/drm/amd/-/issues/4573
Tested-by: Ionut Nechita <ionut_n2001@yahoo.com>
Fixes: 530694f54dd5e ("drm/amdgpu: do not resume device in thaw for normal hibernation")
Acked-by: Alex Deucher <alexander.deucher@amd.com>
Tested-by: Kenneth Crudup <kenny@panix.com>
Signed-off-by: Mario Limonciello (AMD) <superm1@kernel.org>
Cc: 6.17+ <stable@vger.kernel.org> # 6.17+: 495c8d35035e: PM: hibernate: Add pm_hibernation_mode_is_suspend()
Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c