diff options
author | Ville Syrjala <syrjala@sci.fi> | 2006-12-08 05:40:45 -0500 |
---|---|---|
committer | Linus Torvalds <torvalds@woody.osdl.org> | 2006-12-08 11:29:07 -0500 |
commit | efc08a75d3a2d449edab7d1bee312eaa591f7669 (patch) | |
tree | a22c27c69cb226dd6e1fc9dc4c82f57cd81f289e /drivers/video/aty/atyfb.h | |
parent | 4ec3fd71e4f5d1201cb7d2374ffdb4f328091fb4 (diff) |
[PATCH] atyfb: Improve power management
Some register were only set in aty_init() which is not called on resume. I
added the aty_resume_chip() function to reset those registers on resume.
Susped-to-ram now works on a HP Omnibook 6000 with acpi_sleep=s3_bios.
Signed-off-by: Ville Syrjala <syrjala@sci.fi>
Cc: "Antonino A. Daplas" <adaplas@pol.net>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Diffstat (limited to 'drivers/video/aty/atyfb.h')
-rw-r--r-- | drivers/video/aty/atyfb.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/drivers/video/aty/atyfb.h b/drivers/video/aty/atyfb.h index c9b35c6b0b69..f72faff33c0c 100644 --- a/drivers/video/aty/atyfb.h +++ b/drivers/video/aty/atyfb.h | |||
@@ -185,6 +185,7 @@ struct atyfb_par { | |||
185 | int mtrr_aper; | 185 | int mtrr_aper; |
186 | int mtrr_reg; | 186 | int mtrr_reg; |
187 | #endif | 187 | #endif |
188 | u32 mem_cntl; | ||
188 | }; | 189 | }; |
189 | 190 | ||
190 | /* | 191 | /* |
@@ -314,6 +315,7 @@ struct aty_pll_ops { | |||
314 | void (*set_pll) (const struct fb_info * info, const union aty_pll * pll); | 315 | void (*set_pll) (const struct fb_info * info, const union aty_pll * pll); |
315 | void (*get_pll) (const struct fb_info *info, union aty_pll * pll); | 316 | void (*get_pll) (const struct fb_info *info, union aty_pll * pll); |
316 | int (*init_pll) (const struct fb_info * info, union aty_pll * pll); | 317 | int (*init_pll) (const struct fb_info * info, union aty_pll * pll); |
318 | void (*resume_pll)(const struct fb_info *info, union aty_pll *pll); | ||
317 | }; | 319 | }; |
318 | 320 | ||
319 | extern const struct aty_pll_ops aty_pll_ati18818_1; /* ATI 18818 */ | 321 | extern const struct aty_pll_ops aty_pll_ati18818_1; /* ATI 18818 */ |