[PATCH] atyfb: Improve blanking

Force blanking signal and disable display requests when blanked.  Don't
disable LCD backlight with FB_BLANK_NORMAL.

Signed-off-by: Ville Syrjälä <syrjala@sci.fi>
Signed-off-by: Antonino Daplas <adaplas@pol.net>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

diff --git a/drivers/video/aty/atyfb_base.c b/drivers/video/aty/atyfb_base.c
index 209d44680862c3e76e38b189a0ac47edf8a84944..8a10ebf47c224d71ee3a93a291fd224adc3a0099 100644 (file)
--- a/drivers/video/aty/atyfb_base.c
+++ b/drivers/video/aty/atyfb_base.c
@@ -2645,16 +2645,16 @@ static int __init store_video_par(char *video_str, unsigned char m64_num)
 static int atyfb_blank(int blank, struct fb_info *info)
 {
        struct atyfb_par *par = (struct atyfb_par *) info->par;
-       u8 gen_cntl;
+       u32 gen_cntl;
 
        if (par->lock_blank || par->asleep)
                return 0;
 
 #ifdef CONFIG_PMAC_BACKLIGHT
-       if ((_machine == _MACH_Pmac) && blank)
+       if ((_machine == _MACH_Pmac) && blank > FB_BLANK_NORMAL)
                set_backlight_enable(0);
 #elif defined(CONFIG_FB_ATY_GENERIC_LCD)
-       if (par->lcd_table && blank &&
+       if (par->lcd_table && blank > FB_BLANK_NORMAL &&
            (aty_ld_lcd(LCD_GEN_CNTL, par) & LCD_ON)) {
                u32 pm = aty_ld_lcd(POWER_MANAGEMENT, par);
                pm &= ~PWR_BLON;
@@ -2662,31 +2662,31 @@ static int atyfb_blank(int blank, struct fb_info *info)
        }
 #endif
 
-       gen_cntl = aty_ld_8(CRTC_GEN_CNTL, par);
+       gen_cntl = aty_ld_le32(CRTC_GEN_CNTL, par);
        switch (blank) {
                case FB_BLANK_UNBLANK:
-                       gen_cntl &= ~(0x4c);
+                       gen_cntl &= ~0x400004c;
                        break;
                case FB_BLANK_NORMAL:
-                       gen_cntl |= 0x40;
+                       gen_cntl |= 0x4000040;
                        break;
                case FB_BLANK_VSYNC_SUSPEND:
-                       gen_cntl |= 0x8;
+                       gen_cntl |= 0x4000048;
                        break;
                case FB_BLANK_HSYNC_SUSPEND:
-                       gen_cntl |= 0x4;
+                       gen_cntl |= 0x4000044;
                        break;
                case FB_BLANK_POWERDOWN:
-                       gen_cntl |= 0x4c;
+                       gen_cntl |= 0x400004c;
                        break;
        }
-       aty_st_8(CRTC_GEN_CNTL, gen_cntl, par);
+       aty_st_le32(CRTC_GEN_CNTL, gen_cntl, par);
 
 #ifdef CONFIG_PMAC_BACKLIGHT
-       if ((_machine == _MACH_Pmac) && !blank)
+       if ((_machine == _MACH_Pmac) && blank <= FB_BLANK_NORMAL)
                set_backlight_enable(1);
 #elif defined(CONFIG_FB_ATY_GENERIC_LCD)
-       if (par->lcd_table && !blank &&
+       if (par->lcd_table && blank <= FB_BLANK_NORMAL &&
            (aty_ld_lcd(LCD_GEN_CNTL, par) & LCD_ON)) {
                u32 pm = aty_ld_lcd(POWER_MANAGEMENT, par);
                pm |= PWR_BLON;