]> Gentwo Git Trees - linux/.git/commit
PM: hibernate: Fix hybrid-sleep
authorMario Limonciello (AMD) <superm1@kernel.org>
Thu, 25 Sep 2025 18:51:06 +0000 (13:51 -0500)
committerRafael J. Wysocki <rafael.j.wysocki@intel.com>
Thu, 25 Sep 2025 19:36:05 +0000 (21:36 +0200)
commit469d80a3712c66a00b5bb888e62e809db8887ba7
tree71e1915a8985be8f524b272eb78bd373477682b6
parentbd03c7020d753f592fc0813481a27e245b0e4406
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: 12ffc3b1513eb ("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>
kernel/power/hibernate.c