git://git.onelab.eu
/
linux-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
This commit was manufactured by cvs2svn to create tag
[linux-2.6.git]
/
drivers
/
video
/
aty
/
radeon_pm.c
diff --git
a/drivers/video/aty/radeon_pm.c
b/drivers/video/aty/radeon_pm.c
index
c033fe4
..
c26f43c
100644
(file)
--- a/
drivers/video/aty/radeon_pm.c
+++ b/
drivers/video/aty/radeon_pm.c
@@
-465,9
+465,7
@@
static void radeon_pm_setup_for_suspend(struct radeonfb_info *rinfo)
OUTPLL( pllPIXCLKS_CNTL, pixclks_cntl);
OUTPLL( pllPIXCLKS_CNTL, pixclks_cntl);
- /* Switch off LVDS interface */
- OUTREG(LVDS_GEN_CNTL, INREG(LVDS_GEN_CNTL) &
- ~(LVDS_BLON | LVDS_EN | LVDS_ON | LVDS_DIGON));
+
/* Enable System power management */
pll_pwrmgt_cntl = INPLL( pllPLL_PWRMGT_CNTL);
/* Enable System power management */
pll_pwrmgt_cntl = INPLL( pllPLL_PWRMGT_CNTL);
@@
-898,7
+896,7
@@
int radeonfb_pci_suspend(struct pci_dev *pdev, u32 state)
release_console_sem();
release_console_sem();
- pdev->dev.power
.power
_state = state;
+ pdev->dev.power_state = state;
return 0;
}
return 0;
}
@@
-908,7
+906,7
@@
int radeonfb_pci_resume(struct pci_dev *pdev)
struct fb_info *info = pci_get_drvdata(pdev);
struct radeonfb_info *rinfo = info->par;
struct fb_info *info = pci_get_drvdata(pdev);
struct radeonfb_info *rinfo = info->par;
- if (pdev->dev.power
.power
_state == 0)
+ if (pdev->dev.power_state == 0)
return 0;
acquire_console_sem();
return 0;
acquire_console_sem();
@@
-935,7
+933,7
@@
int radeonfb_pci_resume(struct pci_dev *pdev)
release_console_sem();
release_console_sem();
- pdev->dev.power
.power
_state = 0;
+ pdev->dev.power_state = 0;
printk(KERN_DEBUG "radeonfb: resumed !\n");
printk(KERN_DEBUG "radeonfb: resumed !\n");