diff options
author | Rafael J. Wysocki <rjw@sisk.pl> | 2008-02-23 13:13:25 -0500 |
---|---|---|
committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2008-02-23 13:40:04 -0500 |
commit | 3a2d5b700132f35401f1d9e22fe3c2cab02c2549 (patch) | |
tree | ad991428c41aee92a5f78b06bf73430af0e6f7ae /drivers/pci/pci.c | |
parent | 39273b58a409cd6d65c9732bdca00bacd1626672 (diff) |
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 <rjw@sisk.pl>
Acked-by: Pavel Machek <pavel@ucw.cz>
Tested-by: Jeff Chua <jeff.chua.linux@gmail.com>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'drivers/pci/pci.c')
-rw-r--r-- | drivers/pci/pci.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/pci/pci.c b/drivers/pci/pci.c index ae3df46eaabf..183fddaa38b7 100644 --- a/drivers/pci/pci.c +++ b/drivers/pci/pci.c | |||
@@ -554,6 +554,7 @@ pci_power_t pci_choose_state(struct pci_dev *dev, pm_message_t state) | |||
554 | case PM_EVENT_PRETHAW: | 554 | case PM_EVENT_PRETHAW: |
555 | /* REVISIT both freeze and pre-thaw "should" use D0 */ | 555 | /* REVISIT both freeze and pre-thaw "should" use D0 */ |
556 | case PM_EVENT_SUSPEND: | 556 | case PM_EVENT_SUSPEND: |
557 | case PM_EVENT_HIBERNATE: | ||
557 | return PCI_D3hot; | 558 | return PCI_D3hot; |
558 | default: | 559 | default: |
559 | printk("Unrecognized suspend event %d\n", state.event); | 560 | printk("Unrecognized suspend event %d\n", state.event); |