Skip to content

Commit 469d80a

Browse files
superm1rafaeljw
authored andcommitted
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: 12ffc3b ("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>
1 parent bd03c70 commit 469d80a

File tree

1 file changed

+4
-0
lines changed

1 file changed

+4
-0
lines changed

kernel/power/hibernate.c

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -695,12 +695,16 @@ static void power_down(void)
695695

696696
#ifdef CONFIG_SUSPEND
697697
if (hibernation_mode == HIBERNATION_SUSPEND) {
698+
pm_restore_gfp_mask();
698699
error = suspend_devices_and_enter(mem_sleep_current);
699700
if (error) {
700701
hibernation_mode = hibernation_ops ?
701702
HIBERNATION_PLATFORM :
702703
HIBERNATION_SHUTDOWN;
703704
} else {
705+
/* Match pm_restore_gfp_mask() call in hibernate() */
706+
pm_restrict_gfp_mask();
707+
704708
/* Restore swap signature. */
705709
error = swsusp_unmark();
706710
if (error)

0 commit comments

Comments
 (0)