mirror of
https://github.com/BobTheBlinker/android_kernel_motorola_sm6375.git
synced 2026-10-28 10:41:38 -04:00
PM: Introduce PM_EVENT_HIBERNATE callback state
During the last step of hibernation in the "platform" mode (with the help of ACPI) we use the suspend code, including the devices' ->suspend() methods, to prepare the system for entering the ACPI S4 system sleep state. But at least for some devices the operations performed by the ->suspend() callback in that case must be different from its operations during regular suspend. For this reason, introduce the new PM event type PM_EVENT_HIBERNATE and pass it to the device drivers' ->suspend() methods during the last phase of hibernation, so that they can distinguish this case and handle it as appropriate. Modify the drivers that handle PM_EVENT_SUSPEND in a special way and need to handle PM_EVENT_HIBERNATE in the same way. These changes are necessary to fix a hibernation regression related to the i915 driver (ref. http://lkml.org/lkml/2008/2/22/488). Signed-off-by: Rafael J. Wysocki <[email protected]> Acked-by: Pavel Machek <[email protected]> Tested-by: Jeff Chua <[email protected]> Signed-off-by: Linus Torvalds <[email protected]>
This commit is contained in:
parent
39273b58a4
commit
3a2d5b7001
18 changed files with 42 additions and 24 deletions
|
|
@ -1254,7 +1254,7 @@ pmac_ide_macio_suspend(struct macio_dev *mdev, pm_message_t mesg)
|
|||
int rc = 0;
|
||||
|
||||
if (mesg.event != mdev->ofdev.dev.power.power_state.event
|
||||
&& mesg.event == PM_EVENT_SUSPEND) {
|
||||
&& (mesg.event & PM_EVENT_SLEEP)) {
|
||||
rc = pmac_ide_do_suspend(hwif);
|
||||
if (rc == 0)
|
||||
mdev->ofdev.dev.power.power_state = mesg;
|
||||
|
|
@ -1364,7 +1364,7 @@ pmac_ide_pci_suspend(struct pci_dev *pdev, pm_message_t mesg)
|
|||
int rc = 0;
|
||||
|
||||
if (mesg.event != pdev->dev.power.power_state.event
|
||||
&& mesg.event == PM_EVENT_SUSPEND) {
|
||||
&& (mesg.event & PM_EVENT_SLEEP)) {
|
||||
rc = pmac_ide_do_suspend(hwif);
|
||||
if (rc == 0)
|
||||
pdev->dev.power.power_state = mesg;
|
||||
|
|
|
|||
Loading…
Reference in a new issue