Gh0st
/
linux
mirror of https://github.com/torvalds/linux.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

PM: hibernate: Fix hybrid-sleep 

Hybrid sleep will hibernate the system followed by running through
the suspend routine.  Since both the hibernate and the suspend routine
will call pm_restrict_gfp_mask(), pm_restore_gfp_mask() must be called
before starting the suspend sequence.

Add an explicit call to pm_restore_gfp_mask() to power_down() before
the suspend sequence starts. Add an extra call for pm_restrict_gfp_mask()
when exiting suspend so that the pm_restore_gfp_mask() call in hibernate()
is balanced.

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: 12ffc3b151 ("PM: Restrict swap use to later in the suspend sequence")
Tested-by: Kenneth Crudup <kenny@panix.com>
Acked-by: Alex Deucher <alexander.deucher@amd.com>
Signed-off-by: Mario Limonciello (AMD) <superm1@kernel.org>
Link: https://patch.msgid.link/20250925185108.2968494-2-superm1@kernel.org
[ rjw: Add comment explainig the new pm_restrict_gfp_mask() call purpose ]
Cc: 6.16+ <stable@vger.kernel.org> # 6.16+
Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
This commit is contained in:
Mario Limonciello (AMD) 2025-09-25 13:51:06 -05:00 committed by Rafael J. Wysocki
parent bd03c7020d
commit 469d80a371
1 changed files with 4 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
kernel/power/hibernate.c
View File

@ -695,12 +695,16 @@ static void power_down(void)
#ifdef CONFIG_SUSPEND #ifdef CONFIG_SUSPEND
if (hibernation_mode == HIBERNATION_SUSPEND) { if (hibernation_mode == HIBERNATION_SUSPEND) {
pm_restore_gfp_mask();
error = suspend_devices_and_enter(mem_sleep_current); error = suspend_devices_and_enter(mem_sleep_current);
if (error) { if (error) {
hibernation_mode = hibernation_ops ? hibernation_mode = hibernation_ops ?
HIBERNATION_PLATFORM : HIBERNATION_PLATFORM :
HIBERNATION_SHUTDOWN; HIBERNATION_SHUTDOWN;
} else { } else {
/* Match pm_restore_gfp_mask() call in hibernate() */
pm_restrict_gfp_mask();
/* Restore swap signature. */ /* Restore swap signature. */
error = swsusp_unmark(); error = swsusp_unmark();
if (error) if (error)