[PATCH] radeonfb: small cleanup of common register init

This removes the unused common_regs_m6 and add one more register to be
cleared, according to latest XFree code from ATI.

diff --git a/drivers/video/aty/radeon_base.c b/drivers/video/aty/radeon_base.c
index bd2c1264f52c248af09eb27afefe4236d5876f20..dc9fcfd3dd2125c6477379b6073fc8e04e19a7de 100644 (file)
--- a/drivers/video/aty/radeon_base.c
+++ b/drivers/video/aty/radeon_base.c
@@ -222,16 +222,7 @@ static reg_val common_regs[] = {
        { I2C_CNTL_1, 0 },
        { GEN_INT_CNTL, 0 },
        { CAP0_TRIG_CNTL, 0 },
-};
-
-static reg_val common_regs_m6[] = {
-       { OVR_CLR,      0 },
-       { OVR_WID_LEFT_RIGHT,   0 },
-       { OVR_WID_TOP_BOTTOM,   0 },
-       { OV0_SCALE_CNTL,   0 },
-       { SUBPIC_CNTL,      0 },
-       { GEN_INT_CNTL,     0 },
-       { CAP0_TRIG_CNTL,   0 } 
+       { CAP1_TRIG_CNTL, 0 },
 };
 
 /*
@@ -1230,7 +1221,7 @@ static void radeon_write_mode (struct radeonfb_info *rinfo,
 
        radeon_screen_blank(rinfo, VESA_POWERDOWN);
 
-       for (i=0; i<9; i++)
+       for (i=0; i<10; i++)
                OUTREG(common_regs[i].reg, common_regs[i].val);
 
        /* Apply surface registers */

diff --git a/include/video/radeon.h b/include/video/radeon.h
index c8b7042aaadd7c73d1f2acbd5b4fecc6fcdceed5..7499f1f5d802cba7c69542cc5d974ce6e67c7496 100644 (file)
--- a/include/video/radeon.h
+++ b/include/video/radeon.h
@@ -24,6 +24,7 @@
 #define AGP_CNTL                               0x0174
 #define BM_STATUS                              0x0160
 #define CAP0_TRIG_CNTL                        0x0950
+#define CAP1_TRIG_CNTL                        0x09c0
 #define VIPH_CONTROL                          0x0C40
 #define VENDOR_ID                              0x0F00  
 #define DEVICE_ID                              0x0F02