diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2009-03-11 12:14:04 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2009-03-11 12:14:04 -0700 |
| commit | 01f675029dfdcbd83b451bff4138de0d43752c4a (patch) | |
| tree | 5de2d2da53d138056b2e61b11629ae52d1710289 /drivers/video/aty/radeon_pm.c | |
| parent | 932088b136c3aeace052cc23179f54022ce3f723 (diff) | |
| parent | d801cec70d69d2d4121e133edd5c3237fe0e0078 (diff) | |
| download | talos-op-linux-01f675029dfdcbd83b451bff4138de0d43752c4a.tar.gz talos-op-linux-01f675029dfdcbd83b451bff4138de0d43752c4a.zip | |
Merge branch 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc
* 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc:
radeonfb/aty128fb: Disable broken early resume hook for PowerBooks
hvc_console: Remove tty->low_latency on pseries backends
powerpc: fix linkstation and storcenter compilation breakage
powerpc/4xx: Enable SERIAL_OF support by default for Virtex platforms
Diffstat (limited to 'drivers/video/aty/radeon_pm.c')
| -rw-r--r-- | drivers/video/aty/radeon_pm.c | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/drivers/video/aty/radeon_pm.c b/drivers/video/aty/radeon_pm.c index ca5f0dc28546..81603f85e17e 100644 --- a/drivers/video/aty/radeon_pm.c +++ b/drivers/video/aty/radeon_pm.c @@ -2762,12 +2762,13 @@ int radeonfb_pci_resume(struct pci_dev *pdev) return rc; } -#ifdef CONFIG_PPC_OF +#ifdef CONFIG_PPC_OF__disabled static void radeonfb_early_resume(void *data) { struct radeonfb_info *rinfo = data; rinfo->no_schedule = 1; + pci_restore_state(rinfo->pdev); radeonfb_pci_resume(rinfo->pdev); rinfo->no_schedule = 0; } @@ -2834,7 +2835,14 @@ void radeonfb_pm_init(struct radeonfb_info *rinfo, int dynclk, int ignore_devlis */ if (rinfo->pm_mode != radeon_pm_none) { pmac_call_feature(PMAC_FTR_DEVICE_CAN_WAKE, rinfo->of_node, 0, 1); +#if 0 /* Disable the early video resume hack for now as it's causing problems, among + * others we now rely on the PCI core restoring the config space for us, which + * isn't the case with that hack, and that code path causes various things to + * be called with interrupts off while they shouldn't. I'm leaving the code in + * as it can be useful for debugging purposes + */ pmac_set_early_video_resume(radeonfb_early_resume, rinfo); +#endif } #if 0 |
