The patch titled
PM: video drivers and PM_EVENT_PRETHAW
has been added to the -mm tree. Its filename is
pm-video-drivers-and-pm_event_prethaw.patch
See http://www.zip.com.au/~akpm/linux/patches/stuff/added-to-mm.txt to find
out what to do about this
------------------------------------------------------
Subject: PM: video drivers and PM_EVENT_PRETHAW
From: David Brownell <david-b@xxxxxxxxxxx>
Video drivers which explicitly test for messages reporting PM_EVENT_FREEZE
will now handle PM_EVENT_PRETHAW the same way.
Signed-off-by: David Brownell <dbrownell@xxxxxxxxxxxxxxxxxxxxx>
Cc: Greg KH <greg@xxxxxxxxx>
Cc: "Rafael J. Wysocki" <rjw@xxxxxxx>
Cc: Pavel Machek <pavel@xxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxx>
---
drivers/video/aty/radeon_pm.c | 15 +++++++++------
drivers/video/i810/i810_main.c | 12 +++++++-----
drivers/video/nvidia/nvidia.c | 13 +++++++------
drivers/video/savage/savagefb_driver.c | 14 +++++++-------
4 files changed, 30 insertions(+), 24 deletions(-)
diff -puN drivers/video/aty/radeon_pm.c~pm-video-drivers-and-pm_event_prethaw drivers/video/aty/radeon_pm.c
--- 25/drivers/video/aty/radeon_pm.c~pm-video-drivers-and-pm_event_prethaw Tue Jun 27 14:35:52 2006
+++ 25-akpm/drivers/video/aty/radeon_pm.c Tue Jun 27 14:35:52 2006
@@ -2520,25 +2520,28 @@ static int radeon_restore_pci_cfg(struct
}
-int radeonfb_pci_suspend(struct pci_dev *pdev, pm_message_t state)
+int radeonfb_pci_suspend(struct pci_dev *pdev, pm_message_t mesg)
{
struct fb_info *info = pci_get_drvdata(pdev);
struct radeonfb_info *rinfo = info->par;
int i;
- if (state.event == pdev->dev.power.power_state.event)
+ if (mesg.event == pdev->dev.power.power_state.event)
return 0;
- printk(KERN_DEBUG "radeonfb (%s): suspending to state: %d...\n",
- pci_name(pdev), state.event);
+ printk(KERN_DEBUG "radeonfb (%s): suspending for event: %d...\n",
+ pci_name(pdev), mesg.event);
/* For suspend-to-disk, we cheat here. We don't suspend anything and
* let fbcon continue drawing until we are all set. That shouldn't
* really cause any problem at this point, provided that the wakeup
* code knows that any state in memory may not match the HW
*/
- if (state.event == PM_EVENT_FREEZE)
+ switch (mesg.event) {
+ case PM_EVENT_FREEZE: /* about to take snapshot */
+ case PM_EVENT_PRETHAW: /* before restoring snapshot */
goto done;
+ }
acquire_console_sem();
@@ -2605,7 +2608,7 @@ int radeonfb_pci_suspend(struct pci_dev
release_console_sem();
done:
- pdev->dev.power.power_state = state;
+ pdev->dev.power.power_state = mesg;
return 0;
}
diff -puN drivers/video/i810/i810_main.c~pm-video-drivers-and-pm_event_prethaw drivers/video/i810/i810_main.c
--- 25/drivers/video/i810/i810_main.c~pm-video-drivers-and-pm_event_prethaw Tue Jun 27 14:35:52 2006
+++ 25-akpm/drivers/video/i810/i810_main.c Tue Jun 27 14:35:52 2006
@@ -1556,15 +1556,17 @@ static struct fb_ops i810fb_ops __devini
/***********************************************************************
* Power Management *
***********************************************************************/
-static int i810fb_suspend(struct pci_dev *dev, pm_message_t state)
+static int i810fb_suspend(struct pci_dev *dev, pm_message_t mesg)
{
struct fb_info *info = pci_get_drvdata(dev);
struct i810fb_par *par = info->par;
- par->cur_state = state.event;
+ par->cur_state = mesg.event;
- if (state.event == PM_EVENT_FREEZE) {
- dev->dev.power.power_state = state;
+ switch (mesg.event) {
+ case PM_EVENT_FREEZE:
+ case PM_EVENT_PRETHAW:
+ dev->dev.power.power_state = mesg;
return 0;
}
@@ -1580,7 +1582,7 @@ static int i810fb_suspend(struct pci_dev
pci_save_state(dev);
pci_disable_device(dev);
- pci_set_power_state(dev, pci_choose_state(dev, state));
+ pci_set_power_state(dev, pci_choose_state(dev, mesg));
release_console_sem();
return 0;
diff -puN drivers/video/nvidia/nvidia.c~pm-video-drivers-and-pm_event_prethaw drivers/video/nvidia/nvidia.c
--- 25/drivers/video/nvidia/nvidia.c~pm-video-drivers-and-pm_event_prethaw Tue Jun 27 14:35:52 2006
+++ 25-akpm/drivers/video/nvidia/nvidia.c Tue Jun 27 14:35:52 2006
@@ -965,24 +965,25 @@ static struct fb_ops nvidia_fb_ops = {
};
#ifdef CONFIG_PM
-static int nvidiafb_suspend(struct pci_dev *dev, pm_message_t state)
+static int nvidiafb_suspend(struct pci_dev *dev, pm_message_t mesg)
{
struct fb_info *info = pci_get_drvdata(dev);
struct nvidia_par *par = info->par;
+ if (mesg.event == PM_EVENT_PRETHAW)
+ mesg.event = PM_EVENT_FREEZE;
acquire_console_sem();
- par->pm_state = state.event;
+ par->pm_state = mesg.event;
- if (state.event == PM_EVENT_FREEZE) {
- dev->dev.power.power_state = state;
- } else {
+ if (mesg.event == PM_EVENT_SUSPEND) {
fb_set_suspend(info, 1);
nvidiafb_blank(FB_BLANK_POWERDOWN, info);
nvidia_write_regs(par, &par->SavedReg);
pci_save_state(dev);
pci_disable_device(dev);
- pci_set_power_state(dev, pci_choose_state(dev, state));
+ pci_set_power_state(dev, pci_choose_state(dev, mesg));
}
+ dev->dev.power.power_state = mesg;
release_console_sem();
return 0;
diff -puN drivers/video/savage/savagefb_driver.c~pm-video-drivers-and-pm_event_prethaw drivers/video/savage/savagefb_driver.c
--- 25/drivers/video/savage/savagefb_driver.c~pm-video-drivers-and-pm_event_prethaw Tue Jun 27 14:35:52 2006
+++ 25-akpm/drivers/video/savage/savagefb_driver.c Tue Jun 27 14:35:52 2006
@@ -2325,24 +2325,24 @@ static void __devexit savagefb_remove(st
}
}
-static int savagefb_suspend(struct pci_dev* dev, pm_message_t state)
+static int savagefb_suspend(struct pci_dev *dev, pm_message_t mesg)
{
struct fb_info *info = pci_get_drvdata(dev);
struct savagefb_par *par = info->par;
DBG("savagefb_suspend");
-
- par->pm_state = state.event;
+ if (mesg.event == PM_EVENT_PRETHAW)
+ mesg.event = PM_EVENT_FREEZE;
+ par->pm_state = mesg.event;
+ dev->dev.power.power_state = mesg;
/*
* For PM_EVENT_FREEZE, do not power down so the console
* can remain active.
*/
- if (state.event == PM_EVENT_FREEZE) {
- dev->dev.power.power_state = state;
+ if (mesg.event == PM_EVENT_FREEZE)
return 0;
- }
acquire_console_sem();
fb_set_suspend(info, 1);
@@ -2355,7 +2355,7 @@ static int savagefb_suspend(struct pci_d
savage_disable_mmio(par);
pci_save_state(dev);
pci_disable_device(dev);
- pci_set_power_state(dev, pci_choose_state(dev, state));
+ pci_set_power_state(dev, pci_choose_state(dev, mesg));
release_console_sem();
return 0;
_
Patches currently in -mm which might be from david-b@xxxxxxxxxxx are
origin.patch
git-pcmcia.patch
ehci-fix-bogus-alteration-of-a-local-variable.patch
fix-broken-dubious-driver-suspend-methods.patch
pm-define-pm_event_prethaw.patch
pm-pci-and-ide-handle-pm_event_prethaw.patch
pm-video-drivers-and-pm_event_prethaw.patch
pm-usb-hcds-use-pm_event_prethaw.patch
pm-issue-pm_event_prethaw.patch
rtc-add-rtc-rs5c348-driver.patch
-
To unsubscribe from this list: send the line "unsubscribe mm-commits" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
