PM: hibernate: Allow hybrid sleep to work with s2idle
[ Upstream commit85850af4fc
] Hybrid sleep is currently hardcoded to only operate with S3 even on systems that might not support it. Instead of assuming this mode is what the user wants to use, for hybrid sleep follow the setting of `mem_sleep_current` which will respect mem_sleep_default kernel command line and policy decisions made by the presence of the FADT low power idle bit. Fixes:81d45bdf89
("PM / hibernate: Untangle power_down()") Reported-and-tested-by: kolAflash <kolAflash@kolahilft.de> Link: https://bugzilla.kernel.org/show_bug.cgi?id=216574 Signed-off-by: Mario Limonciello <mario.limonciello@amd.com> Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com> Signed-off-by: Sasha Levin <sashal@kernel.org>
This commit is contained in:
parent
b711db2a7b
commit
7952605f20
|
@ -618,7 +618,7 @@ static void power_down(void)
|
||||||
int error;
|
int error;
|
||||||
|
|
||||||
if (hibernation_mode == HIBERNATION_SUSPEND) {
|
if (hibernation_mode == HIBERNATION_SUSPEND) {
|
||||||
error = suspend_devices_and_enter(PM_SUSPEND_MEM);
|
error = suspend_devices_and_enter(mem_sleep_current);
|
||||||
if (error) {
|
if (error) {
|
||||||
hibernation_mode = hibernation_ops ?
|
hibernation_mode = hibernation_ops ?
|
||||||
HIBERNATION_PLATFORM :
|
HIBERNATION_PLATFORM :
|
||||||
|
|
Loading…
Reference in New Issue