]> err.no Git - linux-2.6/commit
PM: Introduce PM_EVENT_HIBERNATE callback state
authorRafael J. Wysocki <rjw@sisk.pl>
Sat, 23 Feb 2008 18:13:25 +0000 (19:13 +0100)
committerLinus Torvalds <torvalds@woody.linux-foundation.org>
Sat, 23 Feb 2008 18:40:04 +0000 (10:40 -0800)
commit3a2d5b700132f35401f1d9e22fe3c2cab02c2549
treead991428c41aee92a5f78b06bf73430af0e6f7ae
parent39273b58a409cd6d65c9732bdca00bacd1626672
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>
18 files changed:
Documentation/power/devices.txt
drivers/ata/ahci.c
drivers/ata/ata_piix.c
drivers/ata/libata-core.c
drivers/ide/ppc/pmac.c
drivers/macintosh/mediabay.c
drivers/pci/pci.c
drivers/scsi/aic7xxx/aic79xx_osm_pci.c
drivers/scsi/aic7xxx/aic7xxx_osm_pci.c
drivers/scsi/mesh.c
drivers/scsi/sd.c
drivers/usb/host/sl811-hcd.c
drivers/usb/host/u132-hcd.c
drivers/video/chipsfb.c
drivers/video/nvidia/nvidia.c
include/linux/pm.h
kernel/power/disk.c
net/rfkill/rfkill.c