]> git.karo-electronics.de Git - mv-sheeva.git/commitdiff
Staging: xgifb: fixed many style issues in XGI_main_26.c
authorPrashant P. Shah <pshah.mumbai@gmail.com>
Mon, 6 Sep 2010 12:04:26 +0000 (17:34 +0530)
committerGreg Kroah-Hartman <gregkh@suse.de>
Tue, 7 Sep 2010 02:43:01 +0000 (19:43 -0700)
This is a patch to the XGI_main_26 file that fixes many style
issues found by the checkpatch.pl tool.
- extra spaces
- invalid code indent
- extra braces
- invalid comment style

Signed-off-by: Prashant P. Shah <pshah.mumbai@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
drivers/staging/xgifb/XGI_main_26.c

index 6c5b2694d792be1402d44155be9380f0fe0c644d..bd863a0b881d66703a19ac50ba788732ec6fbcf9 100644 (file)
@@ -4,7 +4,7 @@
  * Base on TW's sis fbdev code.
  */
 
-//#include <linux/config.h>
+/* #include <linux/config.h> */
 #include <linux/version.h>
 #include <linux/module.h>
 #include <linux/moduleparam.h>
@@ -29,7 +29,6 @@
 #include <linux/types.h>
 #include <linux/proc_fs.h>
 
-
 #ifndef XGIFB_PAN
 #define XGIFB_PAN
 #endif
@@ -46,7 +45,6 @@
 
 int XGIfb_accel = 0;
 
-
 #define Index_CR_GPIO_Reg1 0x48
 #define Index_CR_GPIO_Reg2 0x49
 #define Index_CR_GPIO_Reg3 0x4a
@@ -69,90 +67,84 @@ int XGIfb_GetXG21DefaultLVDSModeIdx(void);
 #ifdef XGIFBDEBUG
 static void dumpVGAReg(void)
 {
-    u8 i,reg;
-
-outXGIIDXREG(XGISR, 0x05, 0x86);
-/*
-outXGIIDXREG(XGISR, 0x08, 0x4f);
-outXGIIDXREG(XGISR, 0x0f, 0x20);
-outXGIIDXREG(XGISR, 0x11, 0x4f);
-outXGIIDXREG(XGISR, 0x13, 0x45);
-outXGIIDXREG(XGISR, 0x14, 0x51);
-outXGIIDXREG(XGISR, 0x1e, 0x41);
-outXGIIDXREG(XGISR, 0x1f, 0x0);
-outXGIIDXREG(XGISR, 0x20, 0xa1);
-outXGIIDXREG(XGISR, 0x22, 0xfb);
-outXGIIDXREG(XGISR, 0x26, 0x22);
-outXGIIDXREG(XGISR, 0x3e, 0x07);
-*/
-
-//outXGIIDXREG(XGICR, 0x19, 0x00);
-//outXGIIDXREG(XGICR, 0x1a, 0x3C);
-//outXGIIDXREG(XGICR, 0x22, 0xff);
-//outXGIIDXREG(XGICR, 0x3D, 0x10);
-
-//outXGIIDXREG(XGICR, 0x4a, 0xf3);
-
-//outXGIIDXREG(XGICR, 0x57, 0x0);
-//outXGIIDXREG(XGICR, 0x7a, 0x2c);
-
-//outXGIIDXREG(XGICR, 0x82, 0xcc);
-//outXGIIDXREG(XGICR, 0x8c, 0x0);
-/*
-outXGIIDXREG(XGICR, 0x99, 0x1);
-outXGIIDXREG(XGICR, 0x41, 0x40);
-*/
-
-    for(i=0; i < 0x4f; i++)
-    {
-        inXGIIDXREG(XGISR, i, reg);
-        printk("\no 3c4 %x",i);
-        printk("\ni 3c5 => %x",reg);
-    }
-
-    for(i=0; i < 0xF0; i++)
-    {
-        inXGIIDXREG(XGICR, i, reg);
-        printk("\no 3d4 %x",i);
-        printk("\ni 3d5 => %x",reg);
-    }
-/*
-
-    outXGIIDXREG(XGIPART1,0x2F,1);
-    for(i=1; i < 0x50; i++)
-    {
-        inXGIIDXREG(XGIPART1, i, reg);
-        printk("\no d004 %x",i);
-        printk("\ni d005 => %x",reg);
-    }
-
-    for(i=0; i < 0x50; i++)
-    {
-        inXGIIDXREG(XGIPART2, i, reg);
-        printk("\no d010 %x",i);
-        printk("\ni d011 => %x",reg);
-    }
-    for(i=0; i < 0x50; i++)
-    {
-        inXGIIDXREG(XGIPART3, i, reg);
-        printk("\no d012 %x",i);
-        printk("\ni d013 => %x",reg);
-    }
-    for(i=0; i < 0x50; i++)
-    {
-        inXGIIDXREG(XGIPART4, i, reg);
-        printk("\no d014 %x",i);
-        printk("\ni d015 => %x",reg);
-    }
-*/
+       u8 i, reg;
+
+       outXGIIDXREG(XGISR, 0x05, 0x86);
+       /*
+       outXGIIDXREG(XGISR, 0x08, 0x4f);
+       outXGIIDXREG(XGISR, 0x0f, 0x20);
+       outXGIIDXREG(XGISR, 0x11, 0x4f);
+       outXGIIDXREG(XGISR, 0x13, 0x45);
+       outXGIIDXREG(XGISR, 0x14, 0x51);
+       outXGIIDXREG(XGISR, 0x1e, 0x41);
+       outXGIIDXREG(XGISR, 0x1f, 0x0);
+       outXGIIDXREG(XGISR, 0x20, 0xa1);
+       outXGIIDXREG(XGISR, 0x22, 0xfb);
+       outXGIIDXREG(XGISR, 0x26, 0x22);
+       outXGIIDXREG(XGISR, 0x3e, 0x07);
+       */
+
+       /* outXGIIDXREG(XGICR, 0x19, 0x00); */
+       /* outXGIIDXREG(XGICR, 0x1a, 0x3C); */
+       /* outXGIIDXREG(XGICR, 0x22, 0xff); */
+       /* outXGIIDXREG(XGICR, 0x3D, 0x10); */
+
+       /* outXGIIDXREG(XGICR, 0x4a, 0xf3); */
+
+       /* outXGIIDXREG(XGICR, 0x57, 0x0); */
+       /* outXGIIDXREG(XGICR, 0x7a, 0x2c); */
+
+       /* outXGIIDXREG(XGICR, 0x82, 0xcc); */
+       /* outXGIIDXREG(XGICR, 0x8c, 0x0); */
+       /*
+       outXGIIDXREG(XGICR, 0x99, 0x1);
+       outXGIIDXREG(XGICR, 0x41, 0x40);
+       */
+
+       for (i = 0; i < 0x4f; i++) {
+               inXGIIDXREG(XGISR, i, reg);
+               printk("\no 3c4 %x", i);
+               printk("\ni 3c5 => %x", reg);
+       }
+
+       for (i = 0; i < 0xF0; i++) {
+               inXGIIDXREG(XGICR, i, reg);
+               printk("\no 3d4 %x", i);
+               printk("\ni 3d5 => %x", reg);
+       }
+       /*
+       outXGIIDXREG(XGIPART1,0x2F,1);
+       for (i=1; i < 0x50; i++) {
+               inXGIIDXREG(XGIPART1, i, reg);
+               printk("\no d004 %x", i);
+               printk("\ni d005 => %x", reg);
+       }
+
+       for (i=0; i < 0x50; i++) {
+                inXGIIDXREG(XGIPART2, i, reg);
+                printk("\no d010 %x", i);
+                printk("\ni d011 => %x", reg);
+       }
+       for (i=0; i < 0x50; i++) {
+               inXGIIDXREG(XGIPART3, i, reg);
+               printk("\no d012 %x",i);
+               printk("\ni d013 => %x",reg);
+       }
+       for (i=0; i < 0x50; i++) {
+               inXGIIDXREG(XGIPART4, i, reg);
+               printk("\no d014 %x",i);
+               printk("\ni d015 => %x",reg);
+       }
+       */
 }
 #else
-static inline void dumpVGAReg(void) {}
+static inline void dumpVGAReg(void)
+{
+}
 #endif
 
 /* data for XGI components */
-struct video_info  xgi_video_info;
-
+struct video_info xgi_video_info;
 
 #if 1
 #define DEBUGPRN(x)
@@ -160,253 +152,244 @@ struct video_info  xgi_video_info;
 #define DEBUGPRN(x) printk(KERN_INFO x "\n");
 #endif
 
-
 /* --------------- Hardware Access Routines -------------------------- */
 
-static int
-XGIfb_mode_rate_to_dclock(struct vb_device_info *XGI_Pr,
-                         struct xgi_hw_device_info *HwDeviceExtension,
-                         unsigned char modeno, unsigned char rateindex)
+static int XGIfb_mode_rate_to_dclock(struct vb_device_info *XGI_Pr,
+               struct xgi_hw_device_info *HwDeviceExtension,
+               unsigned char modeno, unsigned char rateindex)
 {
-    unsigned short ModeNo = modeno;
-    unsigned short ModeIdIndex = 0, ClockIndex = 0;
-    unsigned short RefreshRateTableIndex = 0;
+       unsigned short ModeNo = modeno;
+       unsigned short ModeIdIndex = 0, ClockIndex = 0;
+       unsigned short RefreshRateTableIndex = 0;
 
-    /*unsigned long  temp = 0;*/
-    int    Clock;
-    XGI_Pr->ROMAddr  = HwDeviceExtension->pjVirtualRomBase;
-    InitTo330Pointer( HwDeviceExtension->jChipType, XGI_Pr ) ;
+       /* unsigned long  temp = 0; */
+       int Clock;
+       XGI_Pr->ROMAddr = HwDeviceExtension->pjVirtualRomBase;
+       InitTo330Pointer(HwDeviceExtension->jChipType, XGI_Pr);
 
-    RefreshRateTableIndex = XGI_GetRatePtrCRT2( HwDeviceExtension, ModeNo , ModeIdIndex, XGI_Pr ) ;
+       RefreshRateTableIndex = XGI_GetRatePtrCRT2(HwDeviceExtension, ModeNo,
+                       ModeIdIndex, XGI_Pr);
 
-/*
-    temp = XGI_SearchModeID( ModeNo , &ModeIdIndex,  XGI_Pr ) ;
-    if(!temp) {
-       printk(KERN_ERR "Could not find mode %x\n", ModeNo);
-       return 65000;
-    }
+       /*
+       temp = XGI_SearchModeID(ModeNo , &ModeIdIndex,  XGI_Pr) ;
+       if (!temp) {
+               printk(KERN_ERR "Could not find mode %x\n", ModeNo);
+               return 65000;
+       }
 
-    RefreshRateTableIndex = XGI_Pr->EModeIDTable[ModeIdIndex].REFindex;
-    RefreshRateTableIndex += (rateindex - 1);
+       RefreshRateTableIndex = XGI_Pr->EModeIDTable[ModeIdIndex].REFindex;
+       RefreshRateTableIndex += (rateindex - 1);
 
-*/
-    ClockIndex = XGI_Pr->RefIndex[RefreshRateTableIndex].Ext_CRTVCLK;
-    if(HwDeviceExtension->jChipType < XGI_315H) {
-       ClockIndex &= 0x3F;
-    }
-    Clock = XGI_Pr->VCLKData[ClockIndex].CLOCK * 1000 ;
+       */
+       ClockIndex = XGI_Pr->RefIndex[RefreshRateTableIndex].Ext_CRTVCLK;
+       if (HwDeviceExtension->jChipType < XGI_315H)
+               ClockIndex &= 0x3F;
+
+       Clock = XGI_Pr->VCLKData[ClockIndex].CLOCK * 1000;
 
-    return(Clock);
+       return Clock;
 }
 
-static int
-XGIfb_mode_rate_to_ddata(struct vb_device_info *XGI_Pr,
-                        struct xgi_hw_device_info *HwDeviceExtension,
-                        unsigned char modeno, unsigned char rateindex,
-                        u32 *left_margin, u32 *right_margin,
-                        u32 *upper_margin, u32 *lower_margin,
-                        u32 *hsync_len, u32 *vsync_len,
-                        u32 *sync, u32 *vmode)
+static int XGIfb_mode_rate_to_ddata(struct vb_device_info *XGI_Pr,
+               struct xgi_hw_device_info *HwDeviceExtension,
+               unsigned char modeno, unsigned char rateindex,
+               u32 *left_margin, u32 *right_margin, u32 *upper_margin,
+               u32 *lower_margin, u32 *hsync_len, u32 *vsync_len, u32 *sync,
+               u32 *vmode)
 {
-    unsigned short ModeNo = modeno;
-    unsigned short ModeIdIndex = 0, index = 0;
-    unsigned short RefreshRateTableIndex = 0;
-
-    unsigned short VRE, VBE, VRS, VBS, VDE, VT;
-    unsigned short HRE, HBE, HRS, HBS, HDE, HT;
-    unsigned char  sr_data, cr_data, cr_data2;
-    unsigned long cr_data3;
-    int            A, B, C, D, E, F, temp, j;
-    XGI_Pr->ROMAddr  = HwDeviceExtension->pjVirtualRomBase;
-    InitTo330Pointer( HwDeviceExtension->jChipType, XGI_Pr ) ;
-  RefreshRateTableIndex = XGI_GetRatePtrCRT2( HwDeviceExtension, ModeNo , ModeIdIndex, XGI_Pr ) ;
-/*
-    temp = XGI_SearchModeID( ModeNo, &ModeIdIndex, XGI_Pr);
-    if(!temp) return 0;
-
-    RefreshRateTableIndex = XGI_Pr->EModeIDTable[ModeIdIndex].REFindex;
-    RefreshRateTableIndex += (rateindex - 1);
-*/
-    index = XGI_Pr->RefIndex[RefreshRateTableIndex].Ext_CRT1CRTC;
-
-    sr_data = XGI_Pr->XGINEWUB_CRT1Table[index].CR[5];
+       unsigned short ModeNo = modeno;
+       unsigned short ModeIdIndex = 0, index = 0;
+       unsigned short RefreshRateTableIndex = 0;
+
+       unsigned short VRE, VBE, VRS, VBS, VDE, VT;
+       unsigned short HRE, HBE, HRS, HBS, HDE, HT;
+       unsigned char sr_data, cr_data, cr_data2;
+       unsigned long cr_data3;
+       int A, B, C, D, E, F, temp, j;
+       XGI_Pr->ROMAddr = HwDeviceExtension->pjVirtualRomBase;
+       InitTo330Pointer(HwDeviceExtension->jChipType, XGI_Pr);
+       RefreshRateTableIndex = XGI_GetRatePtrCRT2(HwDeviceExtension, ModeNo,
+                       ModeIdIndex, XGI_Pr);
+       /*
+       temp = XGI_SearchModeID(ModeNo, &ModeIdIndex, XGI_Pr);
+       if (!temp)
+               return 0;
 
-    cr_data = XGI_Pr->XGINEWUB_CRT1Table[index].CR[0];
+       RefreshRateTableIndex = XGI_Pr->EModeIDTable[ModeIdIndex].REFindex;
+       RefreshRateTableIndex += (rateindex - 1);
+       */
+       index = XGI_Pr->RefIndex[RefreshRateTableIndex].Ext_CRT1CRTC;
 
-    /* Horizontal total */
-    HT = (cr_data & 0xff) |
-         ((unsigned short) (sr_data & 0x03) << 8);
-    A = HT + 5;
+       sr_data = XGI_Pr->XGINEWUB_CRT1Table[index].CR[5];
 
-    /*cr_data = XGI_Pr->XGINEWUB_CRT1Table[index].CR[1];
+       cr_data = XGI_Pr->XGINEWUB_CRT1Table[index].CR[0];
 
-     Horizontal display enable end
-    HDE = (cr_data & 0xff) |
-          ((unsigned short) (sr_data & 0x0C) << 6);*/
-    HDE = (XGI_Pr->RefIndex[RefreshRateTableIndex].XRes >> 3) -1;
-    E = HDE + 1;
+       /* Horizontal total */
+       HT = (cr_data & 0xff) | ((unsigned short) (sr_data & 0x03) << 8);
+       A = HT + 5;
 
-    cr_data = XGI_Pr->XGINEWUB_CRT1Table[index].CR[3];
+       /*
+       cr_data = XGI_Pr->XGINEWUB_CRT1Table[index].CR[1];
 
-    /* Horizontal retrace (=sync) start */
-    HRS = (cr_data & 0xff) |
-          ((unsigned short) (sr_data & 0xC0) << 2);
-    F = HRS - E - 3;
+       Horizontal display enable end
+       HDE = (cr_data & 0xff) | ((unsigned short) (sr_data & 0x0C) << 6);
+       */
+       HDE = (XGI_Pr->RefIndex[RefreshRateTableIndex].XRes >> 3) - 1;
+       E = HDE + 1;
 
-    cr_data = XGI_Pr->XGINEWUB_CRT1Table[index].CR[1];
+       cr_data = XGI_Pr->XGINEWUB_CRT1Table[index].CR[3];
 
-    /* Horizontal blank start */
-    HBS = (cr_data & 0xff) |
-          ((unsigned short) (sr_data & 0x30) << 4);
+       /* Horizontal retrace (=sync) start */
+       HRS = (cr_data & 0xff) | ((unsigned short) (sr_data & 0xC0) << 2);
+       F = HRS - E - 3;
 
-    sr_data = XGI_Pr->XGINEWUB_CRT1Table[index].CR[6];
+       cr_data = XGI_Pr->XGINEWUB_CRT1Table[index].CR[1];
 
-    cr_data = XGI_Pr->XGINEWUB_CRT1Table[index].CR[2];
+       /* Horizontal blank start */
+       HBS = (cr_data & 0xff) | ((unsigned short) (sr_data & 0x30) << 4);
 
-    cr_data2 = XGI_Pr->XGINEWUB_CRT1Table[index].CR[4];
+       sr_data = XGI_Pr->XGINEWUB_CRT1Table[index].CR[6];
 
-    /* Horizontal blank end */
-    HBE = (cr_data & 0x1f) |
-          ((unsigned short) (cr_data2 & 0x80) >> 2) |
-         ((unsigned short) (sr_data & 0x03) << 6);
+       cr_data = XGI_Pr->XGINEWUB_CRT1Table[index].CR[2];
 
-    /* Horizontal retrace (=sync) end */
-    HRE = (cr_data2 & 0x1f) | ((sr_data & 0x04) << 3);
+       cr_data2 = XGI_Pr->XGINEWUB_CRT1Table[index].CR[4];
 
-    temp = HBE - ((E - 1) & 255);
-    B = (temp > 0) ? temp : (temp + 256);
+       /* Horizontal blank end */
+       HBE = (cr_data & 0x1f) | ((unsigned short) (cr_data2 & 0x80) >> 2)
+                       | ((unsigned short) (sr_data & 0x03) << 6);
 
-    temp = HRE - ((E + F + 3) & 63);
-    C = (temp > 0) ? temp : (temp + 64);
+       /* Horizontal retrace (=sync) end */
+       HRE = (cr_data2 & 0x1f) | ((sr_data & 0x04) << 3);
 
-    D = B - F - C;
+       temp = HBE - ((E - 1) & 255);
+       B = (temp > 0) ? temp : (temp + 256);
 
-    *left_margin = D * 8;
-    *right_margin = F * 8;
-    *hsync_len = C * 8;
+       temp = HRE - ((E + F + 3) & 63);
+       C = (temp > 0) ? temp : (temp + 64);
 
-    sr_data = XGI_Pr->XGINEWUB_CRT1Table[index].CR[14];
+       D = B - F - C;
 
-    cr_data = XGI_Pr->XGINEWUB_CRT1Table[index].CR[8];
+       *left_margin = D * 8;
+       *right_margin = F * 8;
+       *hsync_len = C * 8;
 
-    cr_data2 = XGI_Pr->XGINEWUB_CRT1Table[index].CR[9];
+       sr_data = XGI_Pr->XGINEWUB_CRT1Table[index].CR[14];
 
-    /* Vertical total */
-    VT = (cr_data & 0xFF) |
-         ((unsigned short) (cr_data2 & 0x01) << 8) |
-        ((unsigned short)(cr_data2 & 0x20) << 4) |
-        ((unsigned short) (sr_data & 0x01) << 10);
-    A = VT + 2;
+       cr_data = XGI_Pr->XGINEWUB_CRT1Table[index].CR[8];
 
-    //cr_data = XGI_Pr->XGINEWUB_CRT1Table[index].CR[10];
+       cr_data2 = XGI_Pr->XGINEWUB_CRT1Table[index].CR[9];
 
-    /* Vertical display enable end */
-/*    VDE = (cr_data & 0xff) |
-          ((unsigned short) (cr_data2 & 0x02) << 7) |
-         ((unsigned short) (cr_data2 & 0x40) << 3) |
-         ((unsigned short) (sr_data & 0x02) << 9); */
-    VDE = XGI_Pr->RefIndex[RefreshRateTableIndex].YRes  -1;
-    E = VDE + 1;
+       /* Vertical total */
+       VT = (cr_data & 0xFF) | ((unsigned short) (cr_data2 & 0x01) << 8)
+                       | ((unsigned short) (cr_data2 & 0x20) << 4)
+                       | ((unsigned short) (sr_data & 0x01) << 10);
+       A = VT + 2;
 
-    cr_data = XGI_Pr->XGINEWUB_CRT1Table[index].CR[10];
+       /* cr_data = XGI_Pr->XGINEWUB_CRT1Table[index].CR[10]; */
 
-    /* Vertical retrace (=sync) start */
-    VRS = (cr_data & 0xff) |
-          ((unsigned short) (cr_data2 & 0x04) << 6) |
-         ((unsigned short) (cr_data2 & 0x80) << 2) |
-         ((unsigned short) (sr_data & 0x08) << 7);
-    F = VRS + 1 - E;
+       /* Vertical display enable end */
+       /*
+       VDE = (cr_data & 0xff) |
+               ((unsigned short) (cr_data2 & 0x02) << 7) |
+               ((unsigned short) (cr_data2 & 0x40) << 3) |
+               ((unsigned short) (sr_data & 0x02) << 9);
+       */
+       VDE = XGI_Pr->RefIndex[RefreshRateTableIndex].YRes - 1;
+       E = VDE + 1;
 
-    cr_data =  XGI_Pr->XGINEWUB_CRT1Table[index].CR[12];
+       cr_data = XGI_Pr->XGINEWUB_CRT1Table[index].CR[10];
 
-    cr_data3 = (XGI_Pr->XGINEWUB_CRT1Table[index].CR[14] & 0x80) << 5;
+       /* Vertical retrace (=sync) start */
+       VRS = (cr_data & 0xff) | ((unsigned short) (cr_data2 & 0x04) << 6)
+                       | ((unsigned short) (cr_data2 & 0x80) << 2)
+                       | ((unsigned short) (sr_data & 0x08) << 7);
+       F = VRS + 1 - E;
 
-    /* Vertical blank start */
-    VBS = (cr_data & 0xff) |
-          ((unsigned short) (cr_data2 & 0x08) << 5) |
-         ((unsigned short) (cr_data3 & 0x20) << 4) |
-         ((unsigned short) (sr_data & 0x04) << 8);
+       cr_data = XGI_Pr->XGINEWUB_CRT1Table[index].CR[12];
 
-    cr_data =  XGI_Pr->XGINEWUB_CRT1Table[index].CR[13];
+       cr_data3 = (XGI_Pr->XGINEWUB_CRT1Table[index].CR[14] & 0x80) << 5;
 
-    /* Vertical blank end */
-    VBE = (cr_data & 0xff) |
-          ((unsigned short) (sr_data & 0x10) << 4);
-    temp = VBE - ((E - 1) & 511);
-    B = (temp > 0) ? temp : (temp + 512);
+       /* Vertical blank start */
+       VBS = (cr_data & 0xff) | ((unsigned short) (cr_data2 & 0x08) << 5)
+                       | ((unsigned short) (cr_data3 & 0x20) << 4)
+                       | ((unsigned short) (sr_data & 0x04) << 8);
 
-    cr_data = XGI_Pr->XGINEWUB_CRT1Table[index].CR[11];
+       cr_data = XGI_Pr->XGINEWUB_CRT1Table[index].CR[13];
 
-    /* Vertical retrace (=sync) end */
-    VRE = (cr_data & 0x0f) | ((sr_data & 0x20) >> 1);
-    temp = VRE - ((E + F - 1) & 31);
-    C = (temp > 0) ? temp : (temp + 32);
+       /* Vertical blank end */
+       VBE = (cr_data & 0xff) | ((unsigned short) (sr_data & 0x10) << 4);
+       temp = VBE - ((E - 1) & 511);
+       B = (temp > 0) ? temp : (temp + 512);
 
-    D = B - F - C;
+       cr_data = XGI_Pr->XGINEWUB_CRT1Table[index].CR[11];
 
-    *upper_margin = D;
-    *lower_margin = F;
-    *vsync_len = C;
+       /* Vertical retrace (=sync) end */
+       VRE = (cr_data & 0x0f) | ((sr_data & 0x20) >> 1);
+       temp = VRE - ((E + F - 1) & 31);
+       C = (temp > 0) ? temp : (temp + 32);
 
-    if(XGI_Pr->RefIndex[RefreshRateTableIndex].Ext_InfoFlag & 0x8000)
-       *sync &= ~FB_SYNC_VERT_HIGH_ACT;
-    else
-       *sync |= FB_SYNC_VERT_HIGH_ACT;
+       D = B - F - C;
 
-    if(XGI_Pr->RefIndex[RefreshRateTableIndex].Ext_InfoFlag & 0x4000)
-       *sync &= ~FB_SYNC_HOR_HIGH_ACT;
-    else
-       *sync |= FB_SYNC_HOR_HIGH_ACT;
+       *upper_margin = D;
+       *lower_margin = F;
+       *vsync_len = C;
 
-    *vmode = FB_VMODE_NONINTERLACED;
-    if(XGI_Pr->RefIndex[RefreshRateTableIndex].Ext_InfoFlag & 0x0080)
-       *vmode = FB_VMODE_INTERLACED;
-    else {
-      j = 0;
-      while(XGI_Pr->EModeIDTable[j].Ext_ModeID != 0xff) {
-          if(XGI_Pr->EModeIDTable[j].Ext_ModeID ==
-                         XGI_Pr->RefIndex[RefreshRateTableIndex].ModeID) {
-              if(XGI_Pr->EModeIDTable[j].Ext_ModeFlag & DoubleScanMode) {
-                 *vmode = FB_VMODE_DOUBLE;
-              }
-             break;
-          }
-         j++;
-      }
-    }
-
-    return 1;
-}
+       if (XGI_Pr->RefIndex[RefreshRateTableIndex].Ext_InfoFlag & 0x8000)
+               *sync &= ~FB_SYNC_VERT_HIGH_ACT;
+       else
+               *sync |= FB_SYNC_VERT_HIGH_ACT;
 
+       if (XGI_Pr->RefIndex[RefreshRateTableIndex].Ext_InfoFlag & 0x4000)
+               *sync &= ~FB_SYNC_HOR_HIGH_ACT;
+       else
+               *sync |= FB_SYNC_HOR_HIGH_ACT;
 
+       *vmode = FB_VMODE_NONINTERLACED;
+       if (XGI_Pr->RefIndex[RefreshRateTableIndex].Ext_InfoFlag & 0x0080)
+               *vmode = FB_VMODE_INTERLACED;
+       else {
+               j = 0;
+               while (XGI_Pr->EModeIDTable[j].Ext_ModeID != 0xff) {
+                       if (XGI_Pr->EModeIDTable[j].Ext_ModeID
+                                       == XGI_Pr->RefIndex[RefreshRateTableIndex].ModeID) {
+                               if (XGI_Pr->EModeIDTable[j].Ext_ModeFlag
+                                               & DoubleScanMode) {
+                                       *vmode = FB_VMODE_DOUBLE;
+                               }
+                               break;
+                       }
+                       j++;
+               }
+       }
 
+       return 1;
+}
 
 static void XGIRegInit(struct vb_device_info *XGI_Pr, unsigned long BaseAddr)
 {
-   XGI_Pr->RelIO = BaseAddr;
-   XGI_Pr->P3c4 = BaseAddr + 0x14;
-   XGI_Pr->P3d4 = BaseAddr + 0x24;
-   XGI_Pr->P3c0 = BaseAddr + 0x10;
-   XGI_Pr->P3ce = BaseAddr + 0x1e;
-   XGI_Pr->P3c2 = BaseAddr + 0x12;
-   XGI_Pr->P3ca = BaseAddr + 0x1a;
-   XGI_Pr->P3c6 = BaseAddr + 0x16;
-   XGI_Pr->P3c7 = BaseAddr + 0x17;
-   XGI_Pr->P3c8 = BaseAddr + 0x18;
-   XGI_Pr->P3c9 = BaseAddr + 0x19;
-   XGI_Pr->P3da = BaseAddr + 0x2A;
-   XGI_Pr->Part1Port = BaseAddr + XGI_CRT2_PORT_04;   /* Digital video interface registers (LCD) */
-   XGI_Pr->Part2Port = BaseAddr + XGI_CRT2_PORT_10;   /* 301 TV Encoder registers */
-   XGI_Pr->Part3Port = BaseAddr + XGI_CRT2_PORT_12;   /* 301 Macrovision registers */
-   XGI_Pr->Part4Port = BaseAddr + XGI_CRT2_PORT_14;   /* 301 VGA2 (and LCD) registers */
-   XGI_Pr->Part5Port = BaseAddr + XGI_CRT2_PORT_14+2; /* 301 palette address port registers */
+       XGI_Pr->RelIO = BaseAddr;
+       XGI_Pr->P3c4 = BaseAddr + 0x14;
+       XGI_Pr->P3d4 = BaseAddr + 0x24;
+       XGI_Pr->P3c0 = BaseAddr + 0x10;
+       XGI_Pr->P3ce = BaseAddr + 0x1e;
+       XGI_Pr->P3c2 = BaseAddr + 0x12;
+       XGI_Pr->P3ca = BaseAddr + 0x1a;
+       XGI_Pr->P3c6 = BaseAddr + 0x16;
+       XGI_Pr->P3c7 = BaseAddr + 0x17;
+       XGI_Pr->P3c8 = BaseAddr + 0x18;
+       XGI_Pr->P3c9 = BaseAddr + 0x19;
+       XGI_Pr->P3da = BaseAddr + 0x2A;
+       XGI_Pr->Part1Port = BaseAddr + XGI_CRT2_PORT_04; /* Digital video interface registers (LCD) */
+       XGI_Pr->Part2Port = BaseAddr + XGI_CRT2_PORT_10; /* 301 TV Encoder registers */
+       XGI_Pr->Part3Port = BaseAddr + XGI_CRT2_PORT_12; /* 301 Macrovision registers */
+       XGI_Pr->Part4Port = BaseAddr + XGI_CRT2_PORT_14; /* 301 VGA2 (and LCD) registers */
+       XGI_Pr->Part5Port = BaseAddr + XGI_CRT2_PORT_14 + 2; /* 301 palette address port registers */
 
 }
 
-
 void XGIfb_set_reg4(u16 port, unsigned long data)
 {
-       outl((u32) (data & 0xffffffff), port);
+       outl((u32)(data & 0xffffffff), port);
 }
 
 u32 XGIfb_get_reg3(u16 port)
@@ -414,14 +397,14 @@ u32 XGIfb_get_reg3(u16 port)
        u32 data;
 
        data = inl(port);
-       return (data);
+       return data;
 }
 
 /* ------------ Interface for init & mode switching code ------------- */
 
-unsigned char
-XGIfb_query_VGA_config_space(struct xgi_hw_device_info *pXGIhw_ext,
-       unsigned long offset, unsigned long set, unsigned long *value)
+unsigned char XGIfb_query_VGA_config_space(
+               struct xgi_hw_device_info *pXGIhw_ext, unsigned long offset,
+               unsigned long set, unsigned long *value)
 {
        static struct pci_dev *pdev = NULL;
        static unsigned char init = 0, valid_pdev = 0;
@@ -433,7 +416,8 @@ XGIfb_query_VGA_config_space(struct xgi_hw_device_info *pXGIhw_ext,
 
        if (!init) {
                init = 1;
-               pdev = pci_get_device(PCI_VENDOR_ID_XG, xgi_video_info.chip_id, pdev);
+               pdev = pci_get_device(PCI_VENDOR_ID_XG, xgi_video_info.chip_id,
+                               pdev);
                if (pdev) {
                        valid_pdev = 1;
                        pci_dev_put(pdev);
@@ -447,14 +431,15 @@ XGIfb_query_VGA_config_space(struct xgi_hw_device_info *pXGIhw_ext,
        }
 
        if (set == 0)
-               pci_read_config_dword(pdev, offset, (u32 *)value);
+               pci_read_config_dword(pdev, offset, (u32 *) value);
        else
                pci_write_config_dword(pdev, offset, (u32)(*value));
 
        return 1;
 }
 
-/*unsigned char XGIfb_query_north_bridge_space(struct xgi_hw_device_info *pXGIhw_ext,
+/*
+unsigned char XGIfb_query_north_bridge_space(struct xgi_hw_device_info *pXGIhw_ext,
        unsigned long offset, unsigned long set, unsigned long *value)
 {
        static struct pci_dev *pdev = NULL;
@@ -494,7 +479,7 @@ XGIfb_query_VGA_config_space(struct xgi_hw_device_info *pXGIhw_ext,
 
        if (!valid_pdev) {
                printk(KERN_DEBUG "XGIfb: Can't find XGI %d North Bridge device.\n",
-                               nbridge_id);
+                       nbridge_id);
                return 0;
        }
 
@@ -512,28 +497,29 @@ static void XGIfb_search_mode(const char *name)
 {
        int i = 0, j = 0, l;
 
-       if(name == NULL) {
-          printk(KERN_ERR "XGIfb: Internal error, using default mode.\n");
-          xgifb_mode_idx = DEFAULT_MODE;
-          if ((xgi_video_info.chip == XG21) && ((xgi_video_info.disp_state & DISPTYPE_DISP2) == DISPTYPE_LCD))
-          {
-              xgifb_mode_idx = XGIfb_GetXG21DefaultLVDSModeIdx();
-          }
-          return;
+       if (name == NULL) {
+               printk(KERN_ERR "XGIfb: Internal error, using default mode.\n");
+               xgifb_mode_idx = DEFAULT_MODE;
+               if ((xgi_video_info.chip == XG21)
+                               && ((xgi_video_info.disp_state & DISPTYPE_DISP2)
+                                               == DISPTYPE_LCD)) {
+                       xgifb_mode_idx = XGIfb_GetXG21DefaultLVDSModeIdx();
+               }
+               return;
        }
 
-
-        if (!strcmp(name, XGIbios_mode[MODE_INDEX_NONE].name)) {
-          printk(KERN_ERR "XGIfb: Mode 'none' not supported anymore. Using default.\n");
-          xgifb_mode_idx = DEFAULT_MODE;
-          if ((xgi_video_info.chip == XG21) && ((xgi_video_info.disp_state & DISPTYPE_DISP2) == DISPTYPE_LCD))
-          {
-              xgifb_mode_idx = XGIfb_GetXG21DefaultLVDSModeIdx();
-          }
-          return;
+       if (!strcmp(name, XGIbios_mode[MODE_INDEX_NONE].name)) {
+               printk(KERN_ERR "XGIfb: Mode 'none' not supported anymore. Using default.\n");
+               xgifb_mode_idx = DEFAULT_MODE;
+               if ((xgi_video_info.chip == XG21)
+                               && ((xgi_video_info.disp_state & DISPTYPE_DISP2)
+                                               == DISPTYPE_LCD)) {
+                       xgifb_mode_idx = XGIfb_GetXG21DefaultLVDSModeIdx();
+               }
+               return;
        }
 
-       while(XGIbios_mode[i].mode_no != 0) {
+       while (XGIbios_mode[i].mode_no != 0) {
                l = min(strlen(name), strlen(XGIbios_mode[i].name));
                if (!strncmp(name, XGIbios_mode[i].name, l)) {
                        xgifb_mode_idx = i;
@@ -542,83 +528,92 @@ static void XGIfb_search_mode(const char *name)
                }
                i++;
        }
-       if(!j) printk(KERN_INFO "XGIfb: Invalid mode '%s'\n", name);
+       if (!j)
+               printk(KERN_INFO "XGIfb: Invalid mode '%s'\n", name);
 }
 
 static void XGIfb_search_vesamode(unsigned int vesamode)
 {
        int i = 0, j = 0;
 
-       if(vesamode == 0) {
+       if (vesamode == 0) {
 
                printk(KERN_ERR "XGIfb: Mode 'none' not supported anymore. Using default.\n");
                xgifb_mode_idx = DEFAULT_MODE;
-               if ((xgi_video_info.chip == XG21) && ((xgi_video_info.disp_state & DISPTYPE_DISP2) == DISPTYPE_LCD))
-               {
-                   xgifb_mode_idx = XGIfb_GetXG21DefaultLVDSModeIdx();
+               if ((xgi_video_info.chip == XG21)
+                               && ((xgi_video_info.disp_state & DISPTYPE_DISP2)
+                                               == DISPTYPE_LCD)) {
+                       xgifb_mode_idx = XGIfb_GetXG21DefaultLVDSModeIdx();
                }
                return;
        }
 
-       vesamode &= 0x1dff;  /* Clean VESA mode number from other flags */
+       vesamode &= 0x1dff; /* Clean VESA mode number from other flags */
 
-       while(XGIbios_mode[i].mode_no != 0) {
-               if( (XGIbios_mode[i].vesa_mode_no_1 == vesamode) ||
-                   (XGIbios_mode[i].vesa_mode_no_2 == vesamode) ) {
+       while (XGIbios_mode[i].mode_no != 0) {
+               if ((XGIbios_mode[i].vesa_mode_no_1 == vesamode)
+                               || (XGIbios_mode[i].vesa_mode_no_2 == vesamode)) {
                        xgifb_mode_idx = i;
                        j = 1;
                        break;
                }
                i++;
        }
-       if(!j) printk(KERN_INFO "XGIfb: Invalid VESA mode 0x%x'\n", vesamode);
+       if (!j)
+               printk(KERN_INFO "XGIfb: Invalid VESA mode 0x%x'\n", vesamode);
 }
 
 static int XGIfb_GetXG21LVDSData(void)
 {
-    u8 tmp;
-    unsigned char *pData;
-    int i,j,k;
-
-    inXGIIDXREG(XGISR,0x1e,tmp);
-    outXGIIDXREG(XGISR, 0x1e, tmp|4);
-
-    pData = xgi_video_info.mmio_vbase+0x20000;
-    if ((pData[0x0]==0x55) && (pData[0x1]==0xAA) && (pData[0x65] & 0x1))
-    {
-        i = pData[ 0x316 ] | ( pData[ 0x317 ] << 8 );
-        j = pData[ i-1 ] ;
-        if ( j == 0xff )
-        {
-         j = 1;
-       }
-        k = 0;
-        do
-        {
-                XGI21_LCDCapList[k].LVDS_Capability = pData[ i ] | ( pData[ i + 1 ] << 8 );
-                XGI21_LCDCapList[k].LVDSHT = pData[ i + 2 ] | ( pData[ i + 3 ] << 8 ) ;
-                XGI21_LCDCapList[k].LVDSVT = pData[ i + 4 ] | ( pData[ i + 5 ] << 8 );
-                XGI21_LCDCapList[k].LVDSHDE = pData[ i + 6 ] | ( pData[ i + 7 ] << 8 );
-                XGI21_LCDCapList[k].LVDSVDE = pData[ i + 8 ] | ( pData[ i + 9 ] << 8 );
-                XGI21_LCDCapList[k].LVDSHFP = pData[ i + 10 ] | ( pData[ i + 11 ] << 8 );
-                XGI21_LCDCapList[k].LVDSVFP = pData[ i + 12 ] | ( pData[ i + 13 ] << 8 );
-                XGI21_LCDCapList[k].LVDSHSYNC = pData[ i + 14 ] | ( pData[ i + 15 ] << 8 );
-                XGI21_LCDCapList[k].LVDSVSYNC = pData[ i + 16 ] | ( pData[ i + 17 ] << 8 );
-                XGI21_LCDCapList[k].VCLKData1 = pData[ i + 18 ] ;
-                XGI21_LCDCapList[k].VCLKData2 = pData[ i + 19 ] ;
-                XGI21_LCDCapList[k].PSC_S1 = pData[ i + 20 ] ;
-                XGI21_LCDCapList[k].PSC_S2 = pData[ i + 21 ] ;
-                XGI21_LCDCapList[k].PSC_S3 = pData[ i + 22 ] ;
-                XGI21_LCDCapList[k].PSC_S4 = pData[ i + 23 ] ;
-                XGI21_LCDCapList[k].PSC_S5 = pData[ i + 24 ] ;
-                i += 25;
-                j--;
-                k++;
-       } while ((j > 0) &&
-                (k < (sizeof(XGI21_LCDCapList)/sizeof(struct XGI21_LVDSCapStruct))));
-        return 1;
-    }
-    return 0;
+       u8 tmp;
+       unsigned char *pData;
+       int i, j, k;
+
+       inXGIIDXREG(XGISR, 0x1e, tmp);
+       outXGIIDXREG(XGISR, 0x1e, tmp | 4);
+
+       pData = xgi_video_info.mmio_vbase + 0x20000;
+       if ((pData[0x0] == 0x55) && (pData[0x1] == 0xAA) && (pData[0x65] & 0x1)) {
+               i = pData[0x316] | (pData[0x317] << 8);
+               j = pData[i - 1];
+               if (j == 0xff)
+                       j = 1;
+
+               k = 0;
+               do {
+                       XGI21_LCDCapList[k].LVDS_Capability = pData[i]
+                                       | (pData[i + 1] << 8);
+                       XGI21_LCDCapList[k].LVDSHT = pData[i + 2] | (pData[i
+                                       + 3] << 8);
+                       XGI21_LCDCapList[k].LVDSVT = pData[i + 4] | (pData[i
+                                       + 5] << 8);
+                       XGI21_LCDCapList[k].LVDSHDE = pData[i + 6] | (pData[i
+                                       + 7] << 8);
+                       XGI21_LCDCapList[k].LVDSVDE = pData[i + 8] | (pData[i
+                                       + 9] << 8);
+                       XGI21_LCDCapList[k].LVDSHFP = pData[i + 10] | (pData[i
+                                       + 11] << 8);
+                       XGI21_LCDCapList[k].LVDSVFP = pData[i + 12] | (pData[i
+                                       + 13] << 8);
+                       XGI21_LCDCapList[k].LVDSHSYNC = pData[i + 14]
+                                       | (pData[i + 15] << 8);
+                       XGI21_LCDCapList[k].LVDSVSYNC = pData[i + 16]
+                                       | (pData[i + 17] << 8);
+                       XGI21_LCDCapList[k].VCLKData1 = pData[i + 18];
+                       XGI21_LCDCapList[k].VCLKData2 = pData[i + 19];
+                       XGI21_LCDCapList[k].PSC_S1 = pData[i + 20];
+                       XGI21_LCDCapList[k].PSC_S2 = pData[i + 21];
+                       XGI21_LCDCapList[k].PSC_S3 = pData[i + 22];
+                       XGI21_LCDCapList[k].PSC_S4 = pData[i + 23];
+                       XGI21_LCDCapList[k].PSC_S5 = pData[i + 24];
+                       i += 25;
+                       j--;
+                       k++;
+               } while ((j > 0) && (k < (sizeof(XGI21_LCDCapList)
+                               / sizeof(struct XGI21_LVDSCapStruct))));
+               return 1;
+       }
+       return 0;
 }
 
 int XGIfb_GetXG21DefaultLVDSModeIdx(void)
@@ -628,218 +623,257 @@ int XGIfb_GetXG21DefaultLVDSModeIdx(void)
        int XGIfb_mode_idx = 0;
 
        found_mode = 0;
-       while( (XGIbios_mode[XGIfb_mode_idx].mode_no != 0) &&
-              (XGIbios_mode[XGIfb_mode_idx].xres <= XGI21_LCDCapList[0].LVDSHDE) )
-       {
-               if( (XGIbios_mode[XGIfb_mode_idx].xres == XGI21_LCDCapList[0].LVDSHDE) &&
-                   (XGIbios_mode[XGIfb_mode_idx].yres == XGI21_LCDCapList[0].LVDSVDE) &&
-                   (XGIbios_mode[XGIfb_mode_idx].bpp == 8))
-               {
+       while ((XGIbios_mode[XGIfb_mode_idx].mode_no != 0)
+                       && (XGIbios_mode[XGIfb_mode_idx].xres
+                                       <= XGI21_LCDCapList[0].LVDSHDE)) {
+               if ((XGIbios_mode[XGIfb_mode_idx].xres
+                               == XGI21_LCDCapList[0].LVDSHDE)
+                               && (XGIbios_mode[XGIfb_mode_idx].yres
+                                               == XGI21_LCDCapList[0].LVDSVDE)
+                               && (XGIbios_mode[XGIfb_mode_idx].bpp == 8)) {
                        XGIfb_mode_no = XGIbios_mode[XGIfb_mode_idx].mode_no;
                        found_mode = 1;
                        break;
                }
                XGIfb_mode_idx++;
        }
-        if (!found_mode)
-         XGIfb_mode_idx = 0;
+       if (!found_mode)
+               XGIfb_mode_idx = 0;
 
-       return (XGIfb_mode_idx);
+       return XGIfb_mode_idx;
 }
 
-
 static int XGIfb_validate_mode(int myindex)
 {
-   u16 xres, yres;
-
-    if (xgi_video_info.chip == XG21)
-    {
-        if ((xgi_video_info.disp_state & DISPTYPE_DISP2) == DISPTYPE_LCD)
-        {
-           xres = XGI21_LCDCapList[0].LVDSHDE;
-           yres = XGI21_LCDCapList[0].LVDSVDE;
-           if(XGIbios_mode[myindex].xres > xres)
-               return(-1);
-            if(XGIbios_mode[myindex].yres > yres)
-               return(-1);
-            if ((XGIbios_mode[myindex].xres < xres) && (XGIbios_mode[myindex].yres < yres) )
-           {
-              if (XGIbios_mode[myindex].bpp > 8)
-                 return(-1);
-           }
-
-       }
-       return(myindex);
-
-    }
-
-    /* FIXME: for now, all is valid on XG27 */
-    if (xgi_video_info.chip == XG27)
-           return(myindex);
-
-    if(!(XGIbios_mode[myindex].chipset & MD_XGI315))
-        return(-1);
-
-   switch (xgi_video_info.disp_state & DISPTYPE_DISP2) {
-     case DISPTYPE_LCD:
-       switch (XGIhw_ext.ulCRT2LCDType) {
-       case LCD_640x480:
-               xres =  640; yres =  480;  break;
-       case LCD_800x600:
-               xres =  800; yres =  600;  break;
-        case LCD_1024x600:
-               xres = 1024; yres =  600;  break;
-       case LCD_1024x768:
-               xres = 1024; yres =  768;  break;
-       case LCD_1152x768:
-               xres = 1152; yres =  768;  break;
-       case LCD_1280x960:
-               xres = 1280; yres =  960;  break;
-       case LCD_1280x768:
-               xres = 1280; yres =  768;  break;
-       case LCD_1280x1024:
-               xres = 1280; yres = 1024;  break;
-       case LCD_1400x1050:
-               xres = 1400; yres = 1050;  break;
-       case LCD_1600x1200:
-               xres = 1600; yres = 1200;  break;
-//     case LCD_320x480:                               // TW: FSTN
-//             xres =  320; yres =  480;  break;
-       default:
-               xres =    0; yres =    0;  break;
-       }
-       if(XGIbios_mode[myindex].xres > xres) {
-               return(-1);
-       }
-        if(XGIbios_mode[myindex].yres > yres) {
-               return(-1);
+       u16 xres, yres;
+
+       if (xgi_video_info.chip == XG21) {
+               if ((xgi_video_info.disp_state & DISPTYPE_DISP2)
+                               == DISPTYPE_LCD) {
+                       xres = XGI21_LCDCapList[0].LVDSHDE;
+                       yres = XGI21_LCDCapList[0].LVDSVDE;
+                       if (XGIbios_mode[myindex].xres > xres)
+                               return -1;
+                       if (XGIbios_mode[myindex].yres > yres)
+                               return -1;
+                       if ((XGIbios_mode[myindex].xres < xres)
+                                       && (XGIbios_mode[myindex].yres < yres)) {
+                               if (XGIbios_mode[myindex].bpp > 8)
+                                       return -1;
+                       }
+
+               }
+               return myindex;
+
        }
-       if((XGIhw_ext.ulExternalChip == 0x01) ||   // LVDS
-           (XGIhw_ext.ulExternalChip == 0x05))    // LVDS+Chrontel
-       {
-          switch (XGIbios_mode[myindex].xres) {
-               case 512:
-                       if(XGIbios_mode[myindex].yres != 512) return -1;
-                       if(XGIhw_ext.ulCRT2LCDType == LCD_1024x600) return -1;
-                       break;
-               case 640:
-                       if((XGIbios_mode[myindex].yres != 400) &&
-                          (XGIbios_mode[myindex].yres != 480))
-                               return -1;
-                       break;
-               case 800:
-                       if(XGIbios_mode[myindex].yres != 600) return -1;
-                       break;
-               case 1024:
-                       if((XGIbios_mode[myindex].yres != 600) &&
-                          (XGIbios_mode[myindex].yres != 768))
-                               return -1;
-                       if((XGIbios_mode[myindex].yres == 600) &&
-                          (XGIhw_ext.ulCRT2LCDType != LCD_1024x600))
-                               return -1;
+
+       /* FIXME: for now, all is valid on XG27 */
+       if (xgi_video_info.chip == XG27)
+               return myindex;
+
+       if (!(XGIbios_mode[myindex].chipset & MD_XGI315))
+               return -1;
+
+       switch (xgi_video_info.disp_state & DISPTYPE_DISP2) {
+       case DISPTYPE_LCD:
+               switch (XGIhw_ext.ulCRT2LCDType) {
+               case LCD_640x480:
+                       xres = 640;
+                       yres = 480;
                        break;
-               case 1152:
-                       if((XGIbios_mode[myindex].yres) != 768) return -1;
-                       if(XGIhw_ext.ulCRT2LCDType != LCD_1152x768) return -1;
+               case LCD_800x600:
+                       xres = 800;
+                       yres = 600;
                        break;
-               case 1280:
-                       if((XGIbios_mode[myindex].yres != 768) &&
-                          (XGIbios_mode[myindex].yres != 1024))
-                               return -1;
-                       if((XGIbios_mode[myindex].yres == 768) &&
-                          (XGIhw_ext.ulCRT2LCDType != LCD_1280x768))
-                               return -1;
+               case LCD_1024x600:
+                       xres = 1024;
+                       yres = 600;
                        break;
-               case 1400:
-                       if(XGIbios_mode[myindex].yres != 1050) return -1;
+               case LCD_1024x768:
+                       xres = 1024;
+                       yres = 768;
                        break;
-               case 1600:
-                       if(XGIbios_mode[myindex].yres != 1200) return -1;
+               case LCD_1152x768:
+                       xres = 1152;
+                       yres = 768;
                        break;
-               default:
-                       return -1;
-          }
-       } else {
-          switch (XGIbios_mode[myindex].xres) {
-               case 512:
-                       if(XGIbios_mode[myindex].yres != 512) return -1;
-                       break;
-               case 640:
-                       if((XGIbios_mode[myindex].yres != 400) &&
-                          (XGIbios_mode[myindex].yres != 480))
-                               return -1;
-                       break;
-               case 800:
-                       if(XGIbios_mode[myindex].yres != 600) return -1;
-                       break;
-               case 1024:
-                       if(XGIbios_mode[myindex].yres != 768) return -1;
+               case LCD_1280x960:
+                       xres = 1280;
+                       yres = 960;
                        break;
-               case 1280:
-                       if((XGIbios_mode[myindex].yres != 960) &&
-                          (XGIbios_mode[myindex].yres != 1024))
-                               return -1;
-                       if(XGIbios_mode[myindex].yres == 960) {
-                           if(XGIhw_ext.ulCRT2LCDType == LCD_1400x1050)
-                               return -1;
-                       }
+               case LCD_1280x768:
+                       xres = 1280;
+                       yres = 768;
                        break;
-               case 1400:
-                       if(XGIbios_mode[myindex].yres != 1050) return -1;
+               case LCD_1280x1024:
+                       xres = 1280;
+                       yres = 1024;
                        break;
-               case 1600:
-                       if(XGIbios_mode[myindex].yres != 1200) return -1;
+               case LCD_1400x1050:
+                       xres = 1400;
+                       yres = 1050;
                        break;
-               default:
-                       return -1;
-          }
-       }
-       break;
-     case DISPTYPE_TV:
-       switch (XGIbios_mode[myindex].xres) {
-       case 512:
-       case 640:
-       case 800:
-               break;
-       case 720:
-               if (xgi_video_info.TV_type == TVMODE_NTSC) {
-                       if (XGIbios_mode[myindex].yres != 480) {
-                               return(-1);
+               case LCD_1600x1200:
+                       xres = 1600;
+                       yres = 1200;
+                       break;
+               /* case LCD_320x480: */ /* TW: FSTN */
+                       /*
+                       xres =  320;
+                       yres =  480;
+                       break;
+                       */
+               default:
+                       xres = 0;
+                       yres = 0;
+                       break;
+               }
+               if (XGIbios_mode[myindex].xres > xres)
+                       return -1;
+               if (XGIbios_mode[myindex].yres > yres)
+                       return -1;
+               if ((XGIhw_ext.ulExternalChip == 0x01) || /* LVDS */
+                               (XGIhw_ext.ulExternalChip == 0x05)) { /* LVDS+Chrontel */
+                       switch (XGIbios_mode[myindex].xres) {
+                       case 512:
+                               if (XGIbios_mode[myindex].yres != 512)
+                                       return -1;
+                               if (XGIhw_ext.ulCRT2LCDType == LCD_1024x600)
+                                       return -1;
+                               break;
+                       case 640:
+                               if ((XGIbios_mode[myindex].yres != 400)
+                                               && (XGIbios_mode[myindex].yres
+                                                               != 480))
+                                       return -1;
+                               break;
+                       case 800:
+                               if (XGIbios_mode[myindex].yres != 600)
+                                       return -1;
+                               break;
+                       case 1024:
+                               if ((XGIbios_mode[myindex].yres != 600)
+                                               && (XGIbios_mode[myindex].yres
+                                                               != 768))
+                                       return -1;
+                               if ((XGIbios_mode[myindex].yres == 600)
+                                               && (XGIhw_ext.ulCRT2LCDType
+                                                               != LCD_1024x600))
+                                       return -1;
+                               break;
+                       case 1152:
+                               if ((XGIbios_mode[myindex].yres) != 768)
+                                       return -1;
+                               if (XGIhw_ext.ulCRT2LCDType != LCD_1152x768)
+                                       return -1;
+                               break;
+                       case 1280:
+                               if ((XGIbios_mode[myindex].yres != 768)
+                                               && (XGIbios_mode[myindex].yres
+                                                               != 1024))
+                                       return -1;
+                               if ((XGIbios_mode[myindex].yres == 768)
+                                               && (XGIhw_ext.ulCRT2LCDType
+                                                               != LCD_1280x768))
+                                       return -1;
+                               break;
+                       case 1400:
+                               if (XGIbios_mode[myindex].yres != 1050)
+                                       return -1;
+                               break;
+                       case 1600:
+                               if (XGIbios_mode[myindex].yres != 1200)
+                                       return -1;
+                               break;
+                       default:
+                               return -1;
                        }
-               } else if (xgi_video_info.TV_type == TVMODE_PAL) {
-                       if (XGIbios_mode[myindex].yres != 576) {
-                               return(-1);
+               } else {
+                       switch (XGIbios_mode[myindex].xres) {
+                       case 512:
+                               if (XGIbios_mode[myindex].yres != 512)
+                                       return -1;
+                               break;
+                       case 640:
+                               if ((XGIbios_mode[myindex].yres != 400)
+                                               && (XGIbios_mode[myindex].yres
+                                                               != 480))
+                                       return -1;
+                               break;
+                       case 800:
+                               if (XGIbios_mode[myindex].yres != 600)
+                                       return -1;
+                               break;
+                       case 1024:
+                               if (XGIbios_mode[myindex].yres != 768)
+                                       return -1;
+                               break;
+                       case 1280:
+                               if ((XGIbios_mode[myindex].yres != 960)
+                                               && (XGIbios_mode[myindex].yres
+                                                               != 1024))
+                                       return -1;
+                               if (XGIbios_mode[myindex].yres == 960) {
+                                       if (XGIhw_ext.ulCRT2LCDType
+                                                       == LCD_1400x1050)
+                                               return -1;
+                               }
+                               break;
+                       case 1400:
+                               if (XGIbios_mode[myindex].yres != 1050)
+                                       return -1;
+                               break;
+                       case 1600:
+                               if (XGIbios_mode[myindex].yres != 1200)
+                                       return -1;
+                               break;
+                       default:
+                               return -1;
                        }
                }
-               // TW: LVDS/CHRONTEL does not support 720
-               if (xgi_video_info.hasVB == HASVB_LVDS_CHRONTEL ||
-                                       xgi_video_info.hasVB == HASVB_CHRONTEL) {
-                               return(-1);
-               }
                break;
-       case 1024:
-               if (xgi_video_info.TV_type == TVMODE_NTSC) {
-                       if(XGIbios_mode[myindex].bpp == 32) {
-                              return(-1);
+       case DISPTYPE_TV:
+               switch (XGIbios_mode[myindex].xres) {
+               case 512:
+               case 640:
+               case 800:
+                       break;
+               case 720:
+                       if (xgi_video_info.TV_type == TVMODE_NTSC) {
+                               if (XGIbios_mode[myindex].yres != 480)
+                                       return -1;
+                       } else if (xgi_video_info.TV_type == TVMODE_PAL) {
+                               if (XGIbios_mode[myindex].yres != 576)
+                                       return -1;
                        }
-               }
-               // TW: LVDS/CHRONTEL only supports < 800 (1024 on 650/Ch7019)
-               if (xgi_video_info.hasVB == HASVB_LVDS_CHRONTEL ||
-                                       xgi_video_info.hasVB == HASVB_CHRONTEL) {
-                   if(xgi_video_info.chip < XGI_315H) {
-                               return(-1);
-                   }
+                       /*  TW: LVDS/CHRONTEL does not support 720 */
+                       if (xgi_video_info.hasVB == HASVB_LVDS_CHRONTEL
+                                       || xgi_video_info.hasVB == HASVB_CHRONTEL) {
+                               return -1;
+                       }
+                       break;
+               case 1024:
+                       if (xgi_video_info.TV_type == TVMODE_NTSC) {
+                               if (XGIbios_mode[myindex].bpp == 32)
+                                       return -1;
+                       }
+                       /* TW: LVDS/CHRONTEL only supports < 800 (1024 on 650/Ch7019) */
+                       if (xgi_video_info.hasVB == HASVB_LVDS_CHRONTEL
+                                       || xgi_video_info.hasVB == HASVB_CHRONTEL) {
+                               if (xgi_video_info.chip < XGI_315H)
+                                       return -1;
+                       }
+                       break;
+               default:
+                       return -1;
                }
                break;
-       default:
-               return(-1);
+       case DISPTYPE_CRT2:
+               if (XGIbios_mode[myindex].xres > 1280)
+                       return -1;
+               break;
        }
-       break;
-     case DISPTYPE_CRT2:
-        if(XGIbios_mode[myindex].xres > 1280) return -1;
-       break;
-     }
-     return(myindex);
+       return myindex;
 
 }
 
@@ -847,10 +881,10 @@ static void XGIfb_search_crt2type(const char *name)
 {
        int i = 0;
 
-       if(name == NULL)
+       if (name == NULL)
                return;
 
-       while(XGI_crt2type[i].type_no != -1) {
+       while (XGI_crt2type[i].type_no != -1) {
                if (!strcmp(name, XGI_crt2type[i].name)) {
                        XGIfb_crt2type = XGI_crt2type[i].type_no;
                        XGIfb_tvplug = XGI_crt2type[i].tvplug_no;
@@ -858,7 +892,7 @@ static void XGIfb_search_crt2type(const char *name)
                }
                i++;
        }
-       if(XGIfb_crt2type < 0)
+       if (XGIfb_crt2type < 0)
                printk(KERN_INFO "XGIfb: Invalid CRT2 type: %s\n", name);
 }
 
@@ -866,7 +900,7 @@ static void XGIfb_search_queuemode(const char *name)
 {
        int i = 0;
 
-       if(name == NULL)
+       if (name == NULL)
                return;
 
        while (XGI_queuemode[i].type_no != -1) {
@@ -890,30 +924,34 @@ static u8 XGIfb_search_refresh_rate(unsigned int rate)
 
        XGIfb_rate_idx = 0;
        while ((XGIfb_vrate[i].idx != 0) && (XGIfb_vrate[i].xres <= xres)) {
-               if ((XGIfb_vrate[i].xres == xres) && (XGIfb_vrate[i].yres == yres)) {
+               if ((XGIfb_vrate[i].xres == xres) && (XGIfb_vrate[i].yres
+                               == yres)) {
                        if (XGIfb_vrate[i].refresh == rate) {
                                XGIfb_rate_idx = XGIfb_vrate[i].idx;
                                break;
                        } else if (XGIfb_vrate[i].refresh > rate) {
                                if ((XGIfb_vrate[i].refresh - rate) <= 3) {
                                        DPRINTK("XGIfb: Adjusting rate from %d up to %d\n",
-                                               rate, XGIfb_vrate[i].refresh);
+                                                       rate, XGIfb_vrate[i].refresh);
                                        XGIfb_rate_idx = XGIfb_vrate[i].idx;
-                                       xgi_video_info.refresh_rate = XGIfb_vrate[i].refresh;
-                               } else if (((rate - XGIfb_vrate[i-1].refresh) <= 2)
-                                               && (XGIfb_vrate[i].idx != 1)) {
+                                       xgi_video_info.refresh_rate
+                                                       = XGIfb_vrate[i].refresh;
+                               } else if (((rate - XGIfb_vrate[i - 1].refresh)
+                                               <= 2) && (XGIfb_vrate[i].idx
+                                               != 1)) {
                                        DPRINTK("XGIfb: Adjusting rate from %d down to %d\n",
-                                               rate, XGIfb_vrate[i-1].refresh);
-                                       XGIfb_rate_idx = XGIfb_vrate[i-1].idx;
-                                       xgi_video_info.refresh_rate = XGIfb_vrate[i-1].refresh;
+                                                       rate, XGIfb_vrate[i-1].refresh);
+                                       XGIfb_rate_idx = XGIfb_vrate[i - 1].idx;
+                                       xgi_video_info.refresh_rate
+                                                       = XGIfb_vrate[i - 1].refresh;
                                }
                                break;
-                       } else if((rate - XGIfb_vrate[i].refresh) <= 2) {
+                       } else if ((rate - XGIfb_vrate[i].refresh) <= 2) {
                                DPRINTK("XGIfb: Adjusting rate from %d down to %d\n",
                                                rate, XGIfb_vrate[i].refresh);
-                               XGIfb_rate_idx = XGIfb_vrate[i].idx;
-                               break;
-                       }
+                               XGIfb_rate_idx = XGIfb_vrate[i].idx;
+                               break;
+                       }
                }
                i++;
        }
@@ -921,7 +959,7 @@ static u8 XGIfb_search_refresh_rate(unsigned int rate)
                return XGIfb_rate_idx;
        } else {
                printk(KERN_INFO
-                       "XGIfb: Unsupported rate %d for %dx%d\n", rate, xres, yres);
+                               "XGIfb: Unsupported rate %d for %dx%d\n", rate, xres, yres);
                return 0;
        }
 }
@@ -930,7 +968,7 @@ static void XGIfb_search_tvstd(const char *name)
 {
        int i = 0;
 
-       if(name == NULL)
+       if (name == NULL)
                return;
 
        while (XGI_tvtype[i].type_no != -1) {
@@ -944,73 +982,70 @@ static void XGIfb_search_tvstd(const char *name)
 
 static unsigned char XGIfb_bridgeisslave(void)
 {
-   unsigned char usScratchP1_00;
+       unsigned char usScratchP1_00;
 
-   if (xgi_video_info.hasVB == HASVB_NONE)
-          return 0;
+       if (xgi_video_info.hasVB == HASVB_NONE)
+               return 0;
 
-   inXGIIDXREG(XGIPART1,0x00,usScratchP1_00);
-   if ((usScratchP1_00 & 0x50) == 0x10)
-          return 1;
-   else
-          return 0;
+       inXGIIDXREG(XGIPART1, 0x00, usScratchP1_00);
+       if ((usScratchP1_00 & 0x50) == 0x10)
+               return 1;
+       else
+               return 0;
 }
 
 static unsigned char XGIfbcheckvretracecrt1(void)
 {
-   unsigned char temp;
-
-   inXGIIDXREG(XGICR,0x17,temp);
-   if (!(temp & 0x80))
-          return 0;
+       unsigned char temp;
 
+       inXGIIDXREG(XGICR, 0x17, temp);
+       if (!(temp & 0x80))
+               return 0;
 
-   inXGIIDXREG(XGISR,0x1f,temp);
-   if (temp & 0xc0)
-          return 0;
+       inXGIIDXREG(XGISR, 0x1f, temp);
+       if (temp & 0xc0)
+               return 0;
 
-   if (inXGIREG(XGIINPSTAT) & 0x08)
-          return 1;
-   else
-          return 0;
+       if (inXGIREG(XGIINPSTAT) & 0x08)
+               return 1;
+       else
+               return 0;
 }
 
 static unsigned char XGIfbcheckvretracecrt2(void)
 {
-   unsigned char temp;
-   if (xgi_video_info.hasVB == HASVB_NONE)
-          return 0;
-   inXGIIDXREG(XGIPART1, 0x30, temp);
-   if (temp & 0x02)
-          return 0;
-   else
-          return 1;
+       unsigned char temp;
+       if (xgi_video_info.hasVB == HASVB_NONE)
+               return 0;
+       inXGIIDXREG(XGIPART1, 0x30, temp);
+       if (temp & 0x02)
+               return 0;
+       else
+               return 1;
 }
 
 static unsigned char XGIfb_CheckVBRetrace(void)
 {
-   if(xgi_video_info.disp_state & DISPTYPE_DISP2) {
-      if(XGIfb_bridgeisslave()) {
-         return(XGIfbcheckvretracecrt1());
-      } else {
-         return(XGIfbcheckvretracecrt2());
-      }
-   }
-   return(XGIfbcheckvretracecrt1());
+       if (xgi_video_info.disp_state & DISPTYPE_DISP2) {
+               if (XGIfb_bridgeisslave())
+                       return XGIfbcheckvretracecrt1();
+               else
+                       return XGIfbcheckvretracecrt2();
+       }
+       return XGIfbcheckvretracecrt1();
 }
 
 /* ----------- FBDev related routines for all series ----------- */
 
-
 static void XGIfb_bpp_to_var(struct fb_var_screeninfo *var)
 {
-       switch(var->bits_per_pixel) {
-          case 8:
-               var->red.offset = var->green.offset = var->blue.offset = 0;
+       switch (var->bits_per_pixel) {
+       case 8:
+               var->red.offset = var->green.offset = var->blue.offset = 0;
                var->red.length = var->green.length = var->blue.length = 6;
                xgi_video_info.video_cmap_len = 256;
                break;
-          case 16:
+       case 16:
                var->red.offset = 11;
                var->red.length = 5;
                var->green.offset = 5;
@@ -1021,7 +1056,7 @@ static void XGIfb_bpp_to_var(struct fb_var_screeninfo *var)
                var->transp.length = 0;
                xgi_video_info.video_cmap_len = 16;
                break;
-          case 32:
+       case 32:
                var->red.offset = 16;
                var->red.length = 8;
                var->green.offset = 8;
@@ -1035,69 +1070,66 @@ static void XGIfb_bpp_to_var(struct fb_var_screeninfo *var)
        }
 }
 
-
-
 static int XGIfb_do_set_var(struct fb_var_screeninfo *var, int isactive,
-                     struct fb_info *info)
+               struct fb_info *info)
 {
 
-       unsigned int htotal = var->left_margin + var->xres +
-               var->right_margin + var->hsync_len;
-       unsigned int vtotal = var->upper_margin + var->yres +
-               var->lower_margin + var->vsync_len;
+       unsigned int htotal = var->left_margin + var->xres + var->right_margin
+                       + var->hsync_len;
+       unsigned int vtotal = var->upper_margin + var->yres + var->lower_margin
+                       + var->vsync_len;
 #if defined(__powerpc__)
        u8 sr_data, cr_data;
 #endif
        unsigned int drate = 0, hrate = 0;
        int found_mode = 0;
        int old_mode;
-//     unsigned char reg,reg1;
+       /* unsigned char reg, reg1; */
 
        DEBUGPRN("Inside do_set_var");
-//        printk(KERN_DEBUG "XGIfb:var->yres=%d, var->upper_margin=%d, var->lower_margin=%d, var->vsync_len=%d\n", var->yres,var->upper_margin,var->lower_margin,var->vsync_len);
+       /* printk(KERN_DEBUG "XGIfb:var->yres=%d, var->upper_margin=%d, var->lower_margin=%d, var->vsync_len=%d\n", var->yres, var->upper_margin, var->lower_margin, var->vsync_len); */
 
-        info->var.xres_virtual = var->xres_virtual;
-        info->var.yres_virtual = var->yres_virtual;
-        info->var.bits_per_pixel = var->bits_per_pixel;
+       info->var.xres_virtual = var->xres_virtual;
+       info->var.yres_virtual = var->yres_virtual;
+       info->var.bits_per_pixel = var->bits_per_pixel;
 
        if ((var->vmode & FB_VMODE_MASK) == FB_VMODE_NONINTERLACED)
                vtotal <<= 1;
        else if ((var->vmode & FB_VMODE_MASK) == FB_VMODE_DOUBLE)
                vtotal <<= 2;
-       else if ((var->vmode & FB_VMODE_MASK) == FB_VMODE_INTERLACED)
-       {
-//             vtotal <<= 1;
-//             var->yres <<= 1;
+       else if ((var->vmode & FB_VMODE_MASK) == FB_VMODE_INTERLACED) {
+               /* vtotal <<= 1; */
+               /* var->yres <<= 1; */
        }
 
-       if(!htotal || !vtotal) {
+       if (!htotal || !vtotal) {
                DPRINTK("XGIfb: Invalid 'var' information\n");
                return -EINVAL;
-       }
-        printk(KERN_DEBUG "XGIfb: var->pixclock=%d, htotal=%d, vtotal=%d\n",
-                var->pixclock,htotal,vtotal);
+       } printk(KERN_DEBUG "XGIfb: var->pixclock=%d, htotal=%d, vtotal=%d\n",
+                       var->pixclock, htotal, vtotal);
 
-
-
-       if(var->pixclock && htotal && vtotal) {
+       if (var->pixclock && htotal && vtotal) {
                drate = 1000000000 / var->pixclock;
                hrate = (drate * 1000) / htotal;
-               xgi_video_info.refresh_rate = (unsigned int) (hrate * 2 / vtotal);
+               xgi_video_info.refresh_rate = (unsigned int) (hrate * 2
+                               / vtotal);
        } else {
                xgi_video_info.refresh_rate = 60;
        }
 
        printk(KERN_DEBUG "XGIfb: Change mode to %dx%dx%d-%dHz\n",
-               var->xres,var->yres,var->bits_per_pixel,xgi_video_info.refresh_rate);
+                       var->xres, var->yres, var->bits_per_pixel, xgi_video_info.refresh_rate);
 
        old_mode = xgifb_mode_idx;
        xgifb_mode_idx = 0;
 
-       while( (XGIbios_mode[xgifb_mode_idx].mode_no != 0) &&
-              (XGIbios_mode[xgifb_mode_idx].xres <= var->xres) ) {
-               if( (XGIbios_mode[xgifb_mode_idx].xres == var->xres) &&
-                   (XGIbios_mode[xgifb_mode_idx].yres == var->yres) &&
-                   (XGIbios_mode[xgifb_mode_idx].bpp == var->bits_per_pixel)) {
+       while ((XGIbios_mode[xgifb_mode_idx].mode_no != 0)
+                       && (XGIbios_mode[xgifb_mode_idx].xres <= var->xres)) {
+               if ((XGIbios_mode[xgifb_mode_idx].xres == var->xres)
+                               && (XGIbios_mode[xgifb_mode_idx].yres
+                                               == var->yres)
+                               && (XGIbios_mode[xgifb_mode_idx].bpp
+                                               == var->bits_per_pixel)) {
                        XGIfb_mode_no = XGIbios_mode[xgifb_mode_idx].mode_no;
                        found_mode = 1;
                        break;
@@ -1105,45 +1137,45 @@ static int XGIfb_do_set_var(struct fb_var_screeninfo *var, int isactive,
                xgifb_mode_idx++;
        }
 
-       if(found_mode)
+       if (found_mode)
                xgifb_mode_idx = XGIfb_validate_mode(xgifb_mode_idx);
        else
                xgifb_mode_idx = -1;
 
-               if(xgifb_mode_idx < 0) {
+       if (xgifb_mode_idx < 0) {
                printk(KERN_ERR "XGIfb: Mode %dx%dx%d not supported\n", var->xres,
-                      var->yres, var->bits_per_pixel);
+                               var->yres, var->bits_per_pixel);
                xgifb_mode_idx = old_mode;
                return -EINVAL;
        }
 
-       if(XGIfb_search_refresh_rate(xgi_video_info.refresh_rate) == 0) {
+       if (XGIfb_search_refresh_rate(xgi_video_info.refresh_rate) == 0) {
                XGIfb_rate_idx = XGIbios_mode[xgifb_mode_idx].rate_idx;
                xgi_video_info.refresh_rate = 60;
        }
 
-       if(isactive) {
-
+       if (isactive) {
 
                XGIfb_pre_setmode();
-               if(XGISetModeNew( &XGIhw_ext, XGIfb_mode_no) == 0) {
+               if (XGISetModeNew(&XGIhw_ext, XGIfb_mode_no) == 0) {
                        printk(KERN_ERR "XGIfb: Setting mode[0x%x] failed\n", XGIfb_mode_no);
                        return -EINVAL;
                }
-       info->fix.line_length = ((info->var.xres_virtual * info->var.bits_per_pixel)>>6);
+               info->fix.line_length = ((info->var.xres_virtual
+                               * info->var.bits_per_pixel) >> 6);
 
-       outXGIIDXREG(XGISR,IND_XGI_PASSWORD,XGI_PASSWORD);
+               outXGIIDXREG(XGISR, IND_XGI_PASSWORD, XGI_PASSWORD);
 
-               outXGIIDXREG(XGICR,0x13,(info->fix.line_length & 0x00ff));
-               outXGIIDXREG(XGISR,0x0E,(info->fix.line_length & 0xff00)>>8);
+               outXGIIDXREG(XGICR, 0x13, (info->fix.line_length & 0x00ff));
+               outXGIIDXREG(XGISR, 0x0E, (info->fix.line_length & 0xff00) >> 8);
 
                XGIfb_post_setmode();
 
-               DPRINTK("XGIfb: Set new mode: %dx%dx%d-%d \n",
-                       XGIbios_mode[xgifb_mode_idx].xres,
-                       XGIbios_mode[xgifb_mode_idx].yres,
-                       XGIbios_mode[xgifb_mode_idx].bpp,
-                       xgi_video_info.refresh_rate);
+               DPRINTK("XGIfb: Set new mode: %dx%dx%d-%d\n",
+                               XGIbios_mode[xgifb_mode_idx].xres,
+                               XGIbios_mode[xgifb_mode_idx].yres,
+                               XGIbios_mode[xgifb_mode_idx].bpp,
+                               xgi_video_info.refresh_rate);
 
                xgi_video_info.video_bpp = XGIbios_mode[xgifb_mode_idx].bpp;
                xgi_video_info.video_vwidth = info->var.xres_virtual;
@@ -1151,46 +1183,47 @@ static int XGIfb_do_set_var(struct fb_var_screeninfo *var, int isactive,
                xgi_video_info.video_vheight = info->var.yres_virtual;
                xgi_video_info.video_height = XGIbios_mode[xgifb_mode_idx].yres;
                xgi_video_info.org_x = xgi_video_info.org_y = 0;
-               xgi_video_info.video_linelength = info->var.xres_virtual * (xgi_video_info.video_bpp >> 3);
+               xgi_video_info.video_linelength = info->var.xres_virtual
+                               * (xgi_video_info.video_bpp >> 3);
                xgi_video_info.accel = 0;
-               if(XGIfb_accel) {
-                  xgi_video_info.accel = (var->accel_flags & FB_ACCELF_TEXT) ? -1 : 0;
+               if (XGIfb_accel) {
+                       xgi_video_info.accel = (var->accel_flags
+                                       & FB_ACCELF_TEXT) ? -1 : 0;
                }
-               switch(xgi_video_info.video_bpp)
-               {
-               case 8:
-                       xgi_video_info.DstColor = 0x0000;
-                       xgi_video_info.XGI310_AccelDepth = 0x00000000;
-                           xgi_video_info.video_cmap_len = 256;
+               switch (xgi_video_info.video_bpp) {
+               case 8:
+                       xgi_video_info.DstColor = 0x0000;
+                       xgi_video_info.XGI310_AccelDepth = 0x00000000;
+                       xgi_video_info.video_cmap_len = 256;
 #if defined(__powerpc__)
-                inXGIIDXREG (XGICR, 0x4D, cr_data);
-                outXGIIDXREG(XGICR, 0x4D, (cr_data & 0xE0));
+                       inXGIIDXREG(XGICR, 0x4D, cr_data);
+                       outXGIIDXREG(XGICR, 0x4D, (cr_data & 0xE0));
 #endif
-                break;
-               case 16:
-               xgi_video_info.DstColor = 0x8000;
-               xgi_video_info.XGI310_AccelDepth = 0x00010000;
+                       break;
+               case 16:
+                       xgi_video_info.DstColor = 0x8000;
+                       xgi_video_info.XGI310_AccelDepth = 0x00010000;
 #if defined(__powerpc__)
-                inXGIIDXREG (XGICR, 0x4D, cr_data);
-                outXGIIDXREG(XGICR, 0x4D, ((cr_data & 0xE0) | 0x0B));
+                       inXGIIDXREG(XGICR, 0x4D, cr_data);
+                       outXGIIDXREG(XGICR, 0x4D, ((cr_data & 0xE0) | 0x0B));
 #endif
-                           xgi_video_info.video_cmap_len = 16;
-               break;
-               case 32:
-               xgi_video_info.DstColor = 0xC000;
-                       xgi_video_info.XGI310_AccelDepth = 0x00020000;
-                           xgi_video_info.video_cmap_len = 16;
+                       xgi_video_info.video_cmap_len = 16;
+                       break;
+               case 32:
+                       xgi_video_info.DstColor = 0xC000;
+                       xgi_video_info.XGI310_AccelDepth = 0x00020000;
+                       xgi_video_info.video_cmap_len = 16;
 #if defined(__powerpc__)
-                inXGIIDXREG (XGICR, 0x4D, cr_data);
-                outXGIIDXREG(XGICR, 0x4D, ((cr_data & 0xE0) | 0x15));
+                       inXGIIDXREG(XGICR, 0x4D, cr_data);
+                       outXGIIDXREG(XGICR, 0x4D, ((cr_data & 0xE0) | 0x15));
 #endif
-               break;
-                   default:
-                           xgi_video_info.video_cmap_len = 16;
-                       printk(KERN_ERR "XGIfb: Unsupported depth %d", xgi_video_info.video_bpp);
-                           xgi_video_info.accel = 0;
-                           break;
-       }
+                       break;
+               default:
+                       xgi_video_info.video_cmap_len = 16;
+                       printk(KERN_ERR "XGIfb: Unsupported depth %d", xgi_video_info.video_bpp);
+                       xgi_video_info.accel = 0;
+                       break;
+               }
        }
        XGIfb_bpp_to_var(var); /*update ARGB info*/
        DEBUGPRN("End of do_set_var");
@@ -1204,92 +1237,88 @@ static int XGIfb_pan_var(struct fb_var_screeninfo *var)
 {
        unsigned int base;
 
-//     printk("Inside pan_var");
+       /* printk("Inside pan_var"); */
 
        if (var->xoffset > (var->xres_virtual - var->xres)) {
-//             printk( "Pan: xo: %d xv %d xr %d\n",
-//                     var->xoffset, var->xres_virtual, var->xres);
+               /* printk("Pan: xo: %d xv %d xr %d\n",
+                       var->xoffset, var->xres_virtual, var->xres); */
                return -EINVAL;
        }
-       if(var->yoffset > (var->yres_virtual - var->yres)) {
-//             printk( "Pan: yo: %d yv %d yr %d\n",
-//                     var->yoffset, var->yres_virtual, var->yres);
+       if (var->yoffset > (var->yres_virtual - var->yres)) {
+               /* printk("Pan: yo: %d yv %d yr %d\n",
+                       var->yoffset, var->yres_virtual, var->yres); */
                return -EINVAL;
        }
-        base = var->yoffset * var->xres_virtual + var->xoffset;
+       base = var->yoffset * var->xres_virtual + var->xoffset;
 
-        /* calculate base bpp dep. */
-        switch(var->bits_per_pixel) {
-        case 16:
-               base >>= 1;
-               break;
+       /* calculate base bpp dep. */
+       switch (var->bits_per_pixel) {
+       case 16:
+               base >>= 1;
+               break;
        case 32:
-               break;
+               break;
        case 8:
-        default:
-               base >>= 2;
-               break;
-        }
+       default:
+               base >>= 2;
+               break;
+       }
 
        outXGIIDXREG(XGISR, IND_XGI_PASSWORD, XGI_PASSWORD);
 
-        outXGIIDXREG(XGICR, 0x0D, base & 0xFF);
+       outXGIIDXREG(XGICR, 0x0D, base & 0xFF);
        outXGIIDXREG(XGICR, 0x0C, (base >> 8) & 0xFF);
        outXGIIDXREG(XGISR, 0x0D, (base >> 16) & 0xFF);
-        outXGIIDXREG(XGISR, 0x37, (base >> 24) & 0x03);
+       outXGIIDXREG(XGISR, 0x37, (base >> 24) & 0x03);
        setXGIIDXREG(XGISR, 0x37, 0xDF, (base >> 21) & 0x04);
 
-        if(xgi_video_info.disp_state & DISPTYPE_DISP2) {
+       if (xgi_video_info.disp_state & DISPTYPE_DISP2) {
                orXGIIDXREG(XGIPART1, XGIfb_CRT2_write_enable, 0x01);
-               outXGIIDXREG(XGIPART1, 0x06, (base & 0xFF));
-               outXGIIDXREG(XGIPART1, 0x05, ((base >> 8) & 0xFF));
-               outXGIIDXREG(XGIPART1, 0x04, ((base >> 16) & 0xFF));
+               outXGIIDXREG(XGIPART1, 0x06, (base & 0xFF));
+               outXGIIDXREG(XGIPART1, 0x05, ((base >> 8) & 0xFF));
+               outXGIIDXREG(XGIPART1, 0x04, ((base >> 16) & 0xFF));
                setXGIIDXREG(XGIPART1, 0x02, 0x7F, ((base >> 24) & 0x01) << 7);
-        }
-//     printk("End of pan_var");
+       }
+       /* printk("End of pan_var"); */
        return 0;
 }
 #endif
 
-
 void XGI_dispinfo(struct ap_data *rec)
 {
-       rec->minfo.bpp    = xgi_video_info.video_bpp;
-       rec->minfo.xres   = xgi_video_info.video_width;
-       rec->minfo.yres   = xgi_video_info.video_height;
+       rec->minfo.bpp = xgi_video_info.video_bpp;
+       rec->minfo.xres = xgi_video_info.video_width;
+       rec->minfo.yres = xgi_video_info.video_height;
        rec->minfo.v_xres = xgi_video_info.video_vwidth;
        rec->minfo.v_yres = xgi_video_info.video_vheight;
-       rec->minfo.org_x  = xgi_video_info.org_x;
-       rec->minfo.org_y  = xgi_video_info.org_y;
-       rec->minfo.vrate  = xgi_video_info.refresh_rate;
-       rec->iobase       = xgi_video_info.vga_base - 0x30;
-       rec->mem_size     = xgi_video_info.video_size;
-       rec->disp_state   = xgi_video_info.disp_state;
-       rec->version      = (VER_MAJOR << 24) | (VER_MINOR << 16) | VER_LEVEL;
-       rec->hasVB        = xgi_video_info.hasVB;
-       rec->TV_type      = xgi_video_info.TV_type;
-       rec->TV_plug      = xgi_video_info.TV_plug;
-       rec->chip         = xgi_video_info.chip;
+       rec->minfo.org_x = xgi_video_info.org_x;
+       rec->minfo.org_y = xgi_video_info.org_y;
+       rec->minfo.vrate = xgi_video_info.refresh_rate;
+       rec->iobase = xgi_video_info.vga_base - 0x30;
+       rec->mem_size = xgi_video_info.video_size;
+       rec->disp_state = xgi_video_info.disp_state;
+       rec->version = (VER_MAJOR << 24) | (VER_MINOR << 16) | VER_LEVEL;
+       rec->hasVB = xgi_video_info.hasVB;
+       rec->TV_type = xgi_video_info.TV_type;
+       rec->TV_plug = xgi_video_info.TV_plug;
+       rec->chip = xgi_video_info.chip;
 }
 
-
-
-
 static int XGIfb_open(struct fb_info *info, int user)
 {
-    return 0;
+       return 0;
 }
 
 static int XGIfb_release(struct fb_info *info, int user)
 {
-    return 0;
+       return 0;
 }
 
 static int XGIfb_get_cmap_len(const struct fb_var_screeninfo *var)
 {
        int rc = 16;
 
-       switch(var->bits_per_pixel) {
+       switch (var->bits_per_pixel) {
        case 8:
                rc = 256;
                break;
@@ -1303,35 +1332,36 @@ static int XGIfb_get_cmap_len(const struct fb_var_screeninfo *var)
        return rc;
 }
 
-static int XGIfb_setcolreg(unsigned regno, unsigned red, unsigned green, unsigned blue,
-                           unsigned transp, struct fb_info *info)
+static int XGIfb_setcolreg(unsigned regno, unsigned red, unsigned green,
+               unsigned blue, unsigned transp, struct fb_info *info)
 {
        if (regno >= XGIfb_get_cmap_len(&info->var))
                return 1;
 
        switch (info->var.bits_per_pixel) {
        case 8:
-               outXGIREG(XGIDACA, regno);
+               outXGIREG(XGIDACA, regno);
                outXGIREG(XGIDACD, (red >> 10));
                outXGIREG(XGIDACD, (green >> 10));
                outXGIREG(XGIDACD, (blue >> 10));
                if (xgi_video_info.disp_state & DISPTYPE_DISP2) {
-                       outXGIREG(XGIDAC2A, regno);
+                       outXGIREG(XGIDAC2A, regno);
                        outXGIREG(XGIDAC2D, (red >> 8));
                        outXGIREG(XGIDAC2D, (green >> 8));
                        outXGIREG(XGIDAC2D, (blue >> 8));
                }
                break;
        case 16:
-               ((u32 *)(info->pseudo_palette))[regno] =
-                   ((red & 0xf800)) | ((green & 0xfc00) >> 5) | ((blue & 0xf800) >> 11);
+               ((u32 *) (info->pseudo_palette))[regno] = ((red & 0xf800))
+                               | ((green & 0xfc00) >> 5) | ((blue & 0xf800)
+                               >> 11);
                break;
        case 32:
                red >>= 8;
                green >>= 8;
                blue >>= 8;
-               ((u32 *) (info->pseudo_palette))[regno] =
-                       (red << 16) | (green << 8) | (blue);
+               ((u32 *) (info->pseudo_palette))[regno] = (red << 16) | (green
+                               << 8) | (blue);
                break;
        }
        return 0;
@@ -1341,20 +1371,19 @@ static int XGIfb_set_par(struct fb_info *info)
 {
        int err;
 
-//     printk("XGIfb: inside set_par\n");
-        if((err = XGIfb_do_set_var(&info->var, 1, info)))
+       /* printk("XGIfb: inside set_par\n"); */
+       err = XGIfb_do_set_var(&info->var, 1, info);
+       if (err)
                return err;
        XGIfb_get_fix(&info->fix, -1, info);
-//     printk("XGIfb:end of set_par\n");
+       /* printk("XGIfb: end of set_par\n"); */
        return 0;
 }
 
-static int XGIfb_check_var(struct fb_var_screeninfo *var,
-                           struct fb_info *info)
+static int XGIfb_check_var(struct fb_var_screeninfo *var, struct fb_info *info)
 {
-       unsigned int htotal =
-               var->left_margin + var->xres + var->right_margin +
-               var->hsync_len;
+       unsigned int htotal = var->left_margin + var->xres + var->right_margin
+                       + var->hsync_len;
        unsigned int vtotal = 0;
        unsigned int drate = 0, hrate = 0;
        int found_mode = 0;
@@ -1362,90 +1391,91 @@ static int XGIfb_check_var(struct fb_var_screeninfo *var,
 
        DEBUGPRN("Inside check_var");
 
-       if((var->vmode & FB_VMODE_MASK) == FB_VMODE_NONINTERLACED) {
-               vtotal = var->upper_margin + var->yres + var->lower_margin +
-                        var->vsync_len;
+       if ((var->vmode & FB_VMODE_MASK) == FB_VMODE_NONINTERLACED) {
+               vtotal = var->upper_margin + var->yres + var->lower_margin
+                               + var->vsync_len;
                vtotal <<= 1;
-       } else if((var->vmode & FB_VMODE_MASK) == FB_VMODE_DOUBLE) {
-               vtotal = var->upper_margin + var->yres + var->lower_margin +
-                        var->vsync_len;
+       } else if ((var->vmode & FB_VMODE_MASK) == FB_VMODE_DOUBLE) {
+               vtotal = var->upper_margin + var->yres + var->lower_margin
+                               + var->vsync_len;
                vtotal <<= 2;
-       } else if((var->vmode & FB_VMODE_MASK) == FB_VMODE_INTERLACED) {
-               vtotal = var->upper_margin + (var->yres/2) + var->lower_margin +
-                        var->vsync_len;
-       } else  vtotal = var->upper_margin + var->yres + var->lower_margin +
-                        var->vsync_len;
+       } else if ((var->vmode & FB_VMODE_MASK) == FB_VMODE_INTERLACED) {
+               vtotal = var->upper_margin + (var->yres / 2)
+                               + var->lower_margin + var->vsync_len;
+       } else
+               vtotal = var->upper_margin + var->yres + var->lower_margin
+                               + var->vsync_len;
 
-       if(!(htotal) || !(vtotal)) {
+       if (!(htotal) || !(vtotal))
                XGIFAIL("XGIfb: no valid timing data");
-       }
 
+       if (var->pixclock && htotal && vtotal) {
+               drate = 1000000000 / var->pixclock;
+               hrate = (drate * 1000) / htotal;
+               xgi_video_info.refresh_rate = (unsigned int) (hrate * 2 / vtotal);
+               printk(KERN_DEBUG
+                       "%s: pixclock = %d ,htotal=%d, vtotal=%d\n"
+                       "%s: drate=%d, hrate=%d, refresh_rate=%d\n",
+                       __func__, var->pixclock, htotal, vtotal,
+                       __func__, drate, hrate, xgi_video_info.refresh_rate);
+       } else {
+               xgi_video_info.refresh_rate = 60;
+       }
 
-        if(var->pixclock && htotal && vtotal) {
-                drate = 1000000000 / var->pixclock;
-                hrate = (drate * 1000) / htotal;
-                xgi_video_info.refresh_rate = (unsigned int) (hrate * 2 / vtotal);
-       printk(KERN_DEBUG \
-               "%s: pixclock = %d ,htotal=%d, vtotal=%d\n" \
-               "%s: drate=%d, hrate=%d, refresh_rate=%d\n",
-               __func__,var->pixclock, htotal, vtotal,
-               __func__, drate, hrate, xgi_video_info.refresh_rate);
-        } else {
-                xgi_video_info.refresh_rate = 60;
-        }
-
-/*
-       if((var->pixclock) && (htotal)) {
-          drate = 1E12 / var->pixclock;
-          hrate = drate / htotal;
-          refresh_rate = (unsigned int) (hrate / vtotal * 2 + 0.5);
-       } else refresh_rate = 60;
-*/
+       /*
+       if ((var->pixclock) && (htotal)) {
+               drate = 1E12 / var->pixclock;
+               hrate = drate / htotal;
+               refresh_rate = (unsigned int) (hrate / vtotal * 2 + 0.5);
+       } else {
+               refresh_rate = 60;
+       }
+       */
        /* TW: Calculation wrong for 1024x600 - force it to 60Hz */
-       if((var->xres == 1024) && (var->yres == 600)) refresh_rate = 60;
+       if ((var->xres == 1024) && (var->yres == 600))
+               refresh_rate = 60;
 
        search_idx = 0;
-       while((XGIbios_mode[search_idx].mode_no != 0) &&
-              (XGIbios_mode[search_idx].xres <= var->xres) ) {
-           if((XGIbios_mode[search_idx].xres == var->xres) &&
-              (XGIbios_mode[search_idx].yres == var->yres) &&
-                   (XGIbios_mode[search_idx].bpp == var->bits_per_pixel)) {
-                       if(XGIfb_validate_mode(search_idx) > 0) {
-                   found_mode = 1;
-                   break;
-               }
-           }
+       while ((XGIbios_mode[search_idx].mode_no != 0) &&
+               (XGIbios_mode[search_idx].xres <= var->xres)) {
+               if ((XGIbios_mode[search_idx].xres == var->xres) &&
+                       (XGIbios_mode[search_idx].yres == var->yres) &&
+                       (XGIbios_mode[search_idx].bpp == var->bits_per_pixel)) {
+                       if (XGIfb_validate_mode(search_idx) > 0) {
+                               found_mode = 1;
+                               break;
+                       }
+               }
                search_idx++;
        }
 
-       if(!found_mode) {
+       if (!found_mode) {
 
                printk(KERN_ERR "XGIfb: %dx%dx%d is no valid mode\n",
                        var->xres, var->yres, var->bits_per_pixel);
-
-                search_idx = 0;
-               while(XGIbios_mode[search_idx].mode_no != 0) {
-
-                  if( (var->xres <= XGIbios_mode[search_idx].xres) &&
-                      (var->yres <= XGIbios_mode[search_idx].yres) &&
-                      (var->bits_per_pixel == XGIbios_mode[search_idx].bpp) ) {
-                         if(XGIfb_validate_mode(search_idx) > 0) {
-                            found_mode = 1;
-                            break;
-                         }
-                  }
-                  search_idx++;
-               }
-               if(found_mode) {
+               search_idx = 0;
+               while (XGIbios_mode[search_idx].mode_no != 0) {
+
+                       if ((var->xres <= XGIbios_mode[search_idx].xres) &&
+                               (var->yres <= XGIbios_mode[search_idx].yres) &&
+                               (var->bits_per_pixel == XGIbios_mode[search_idx].bpp)) {
+                               if (XGIfb_validate_mode(search_idx) > 0) {
+                                       found_mode = 1;
+                                       break;
+                               }
+                       }
+                       search_idx++;
+               }
+               if (found_mode) {
                        var->xres = XGIbios_mode[search_idx].xres;
-                       var->yres = XGIbios_mode[search_idx].yres;
-                       printk(KERN_DEBUG "XGIfb: Adapted to mode %dx%dx%d\n",
-                               var->xres, var->yres, var->bits_per_pixel);
+                       var->yres = XGIbios_mode[search_idx].yres;
+                       printk(KERN_DEBUG "XGIfb: Adapted to mode %dx%dx%d\n",
+                               var->xres, var->yres, var->bits_per_pixel);
 
                } else {
-                       printk(KERN_ERR "XGIfb: Failed to find similar mode to %dx%dx%d\n",
+                       printk(KERN_ERR "XGIfb: Failed to find similar mode to %dx%dx%d\n",
                                var->xres, var->yres, var->bits_per_pixel);
-                       return -EINVAL;
+                       return -EINVAL;
                }
        }
 
@@ -1460,21 +1490,20 @@ static int XGIfb_check_var(struct fb_var_screeninfo *var,
        if (var->yoffset < 0)
                var->yoffset = 0;
 
-
-       if(!XGIfb_ypan) {
-               if(var->xres != var->xres_virtual)
-                        var->xres_virtual = var->xres;
-               if(var->yres != var->yres_virtual)
+       if (!XGIfb_ypan) {
+               if (var->xres != var->xres_virtual)
+                       var->xres_virtual = var->xres;
+               if (var->yres != var->yres_virtual)
                        var->yres_virtual = var->yres;
-       }/* else {
-          // TW: Now patch yres_virtual if we use panning
-          // May I do this?
-          var->yres_virtual = xgi_video_info.heapstart / (var->xres * (var->bits_per_pixel >> 3));
-           if(var->yres_virtual <= var->yres) {
-               // TW: Paranoia check
-               var->yres_virtual = var->yres;
-           }
-       }*/
+       } /* else { */
+               /* TW: Now patch yres_virtual if we use panning */
+               /* May I do this? */
+               /* var->yres_virtual = xgi_video_info.heapstart / (var->xres * (var->bits_per_pixel >> 3)); */
+               /* if (var->yres_virtual <= var->yres) { */
+               /* TW: Paranoia check */
+               /* var->yres_virtual = var->yres; */
+               /* } */
+       /* } */
 
        /* Truncate offsets to maximum if too high */
        if (var->xoffset > var->xres_virtual - var->xres)
@@ -1485,21 +1514,21 @@ static int XGIfb_check_var(struct fb_var_screeninfo *var,
 
        /* Set everything else to 0 */
        var->red.msb_right =
-           var->green.msb_right =
-           var->blue.msb_right =
-           var->transp.offset = var->transp.length = var->transp.msb_right = 0;
+       var->green.msb_right =
+       var->blue.msb_right =
+       var->transp.offset = var->transp.length = var->transp.msb_right = 0;
 
        DEBUGPRN("end of check_var");
        return 0;
 }
 
 #ifdef XGIFB_PAN
-static int XGIfb_pan_display( struct fb_var_screeninfo *var,
-                                struct fb_info* info)
+static int XGIfb_pan_display(struct fb_var_screeninfo *var,
+               struct fb_info *info)
 {
        int err;
 
-//     printk("\nInside pan_display:");
+       /* printk("\nInside pan_display:\n"); */
 
        if (var->xoffset > (var->xres_virtual - var->xres))
                return -EINVAL;
@@ -1507,16 +1536,18 @@ static int XGIfb_pan_display( struct fb_var_screeninfo *var,
                return -EINVAL;
 
        if (var->vmode & FB_VMODE_YWRAP) {
-               if (var->yoffset < 0
-                   || var->yoffset >= info->var.yres_virtual
-                   || var->xoffset) return -EINVAL;
+               if (var->yoffset < 0 || var->yoffset >= info->var.yres_virtual
+                               || var->xoffset)
+                       return -EINVAL;
        } else {
-               if (var->xoffset + info->var.xres > info->var.xres_virtual ||
-                   var->yoffset + info->var.yres > info->var.yres_virtual)
+               if (var->xoffset + info->var.xres > info->var.xres_virtual
+                               || var->yoffset + info->var.yres
+                                               > info->var.yres_virtual)
                        return -EINVAL;
        }
-
-       if((err = XGIfb_pan_var(var)) < 0) return err;
+       err = XGIfb_pan_var(var);
+       if (err < 0)
+               return err;
 
        info->var.xoffset = var->xoffset;
        info->var.yoffset = var->yoffset;
@@ -1525,139 +1556,135 @@ static int XGIfb_pan_display( struct fb_var_screeninfo *var,
        else
                info->var.vmode &= ~FB_VMODE_YWRAP;
 
-//     printk(" End of pan_display");
+       /* printk("End of pan_display\n"); */
        return 0;
 }
 #endif
 
-
 static int XGIfb_blank(int blank, struct fb_info *info)
 {
        u8 reg;
 
        inXGIIDXREG(XGICR, 0x17, reg);
 
-       if(blank > 0)
+       if (blank > 0)
                reg &= 0x7f;
        else
                reg |= 0x80;
 
-        outXGIIDXREG(XGICR, 0x17, reg);
-       outXGIIDXREG(XGISR, 0x00, 0x01);    /* Synchronous Reset */
-       outXGIIDXREG(XGISR, 0x00, 0x03);    /* End Reset */
-        return(0);
+       outXGIIDXREG(XGICR, 0x17, reg);
+       outXGIIDXREG(XGISR, 0x00, 0x01); /* Synchronous Reset */
+       outXGIIDXREG(XGISR, 0x00, 0x03); /* End Reset */
+       return 0;
 }
 
-
 static int XGIfb_ioctl(struct fb_info *info, unsigned int cmd,
-                           unsigned long arg)
+               unsigned long arg)
 {
        DEBUGPRN("inside ioctl");
        switch (cmd) {
-          case FBIO_ALLOC:
+       case FBIO_ALLOC:
                if (!capable(CAP_SYS_RAWIO))
                        return -EPERM;
                XGI_malloc((struct XGI_memreq *) arg);
                break;
-          case FBIO_FREE:
+       case FBIO_FREE:
                if (!capable(CAP_SYS_RAWIO))
                        return -EPERM;
                XGI_free(*(unsigned long *) arg);
                break;
-          case FBIOGET_HWCINFO:
-               {
-                       unsigned long *hwc_offset = (unsigned long *) arg;
+       case FBIOGET_HWCINFO: {
+               unsigned long *hwc_offset = (unsigned long *) arg;
 
-                       if (XGIfb_caps & HW_CURSOR_CAP)
-                               *hwc_offset = XGIfb_hwcursor_vbase -
-                                   (unsigned long) xgi_video_info.video_vbase;
-                       else
-                               *hwc_offset = 0;
+               if (XGIfb_caps & HW_CURSOR_CAP)
+                       *hwc_offset
+                                       = XGIfb_hwcursor_vbase
+                                                       - (unsigned long) xgi_video_info.video_vbase;
+               else
+                       *hwc_offset = 0;
 
+               break;
+       }
+       case FBIOPUT_MODEINFO: {
+               struct mode_info *x = (struct mode_info *) arg;
+
+               xgi_video_info.video_bpp = x->bpp;
+               xgi_video_info.video_width = x->xres;
+               xgi_video_info.video_height = x->yres;
+               xgi_video_info.video_vwidth = x->v_xres;
+               xgi_video_info.video_vheight = x->v_yres;
+               xgi_video_info.org_x = x->org_x;
+               xgi_video_info.org_y = x->org_y;
+               xgi_video_info.refresh_rate = x->vrate;
+               xgi_video_info.video_linelength = xgi_video_info.video_vwidth
+                               * (xgi_video_info.video_bpp >> 3);
+               switch (xgi_video_info.video_bpp) {
+               case 8:
+                       xgi_video_info.DstColor = 0x0000;
+                       xgi_video_info.XGI310_AccelDepth = 0x00000000;
+                       xgi_video_info.video_cmap_len = 256;
                        break;
-               }
-          case FBIOPUT_MODEINFO:
-               {
-                       struct mode_info *x = (struct mode_info *)arg;
-
-                       xgi_video_info.video_bpp        = x->bpp;
-                       xgi_video_info.video_width      = x->xres;
-                       xgi_video_info.video_height     = x->yres;
-                       xgi_video_info.video_vwidth     = x->v_xres;
-                       xgi_video_info.video_vheight    = x->v_yres;
-                       xgi_video_info.org_x            = x->org_x;
-                       xgi_video_info.org_y            = x->org_y;
-                       xgi_video_info.refresh_rate     = x->vrate;
-                       xgi_video_info.video_linelength = xgi_video_info.video_vwidth * (xgi_video_info.video_bpp >> 3);
-                       switch(xgi_video_info.video_bpp) {
-                       case 8:
-                               xgi_video_info.DstColor = 0x0000;
-                               xgi_video_info.XGI310_AccelDepth = 0x00000000;
-                               xgi_video_info.video_cmap_len = 256;
-                               break;
-                       case 16:
-                               xgi_video_info.DstColor = 0x8000;
-                               xgi_video_info.XGI310_AccelDepth = 0x00010000;
-                               xgi_video_info.video_cmap_len = 16;
-                               break;
-                       case 32:
-                               xgi_video_info.DstColor = 0xC000;
-                               xgi_video_info.XGI310_AccelDepth = 0x00020000;
-                               xgi_video_info.video_cmap_len = 16;
-                               break;
-                       default:
-                               xgi_video_info.video_cmap_len = 16;
-                               printk(KERN_ERR "XGIfb: Unsupported accel depth %d", xgi_video_info.video_bpp);
-                               xgi_video_info.accel = 0;
-                               break;
-                       }
-
+               case 16:
+                       xgi_video_info.DstColor = 0x8000;
+                       xgi_video_info.XGI310_AccelDepth = 0x00010000;
+                       xgi_video_info.video_cmap_len = 16;
+                       break;
+               case 32:
+                       xgi_video_info.DstColor = 0xC000;
+                       xgi_video_info.XGI310_AccelDepth = 0x00020000;
+                       xgi_video_info.video_cmap_len = 16;
+                       break;
+               default:
+                       xgi_video_info.video_cmap_len = 16;
+                       printk(KERN_ERR "XGIfb: Unsupported accel depth %d", xgi_video_info.video_bpp);
+                       xgi_video_info.accel = 0;
                        break;
                }
-          case FBIOGET_DISPINFO:
-               XGI_dispinfo((struct ap_data *)arg);
+
                break;
-          case XGIFB_GET_INFO:  /* TW: New for communication with X driver */
-               {
-                       struct XGIfb_info *x = (struct XGIfb_info *)arg;
-
-                       //x->XGIfb_id = XGIFB_ID;
-                       x->XGIfb_version = VER_MAJOR;
-                       x->XGIfb_revision = VER_MINOR;
-                       x->XGIfb_patchlevel = VER_LEVEL;
-                       x->chip_id = xgi_video_info.chip_id;
-                       x->memory = xgi_video_info.video_size / 1024;
-                       x->heapstart = xgi_video_info.heapstart / 1024;
-                       x->fbvidmode = XGIfb_mode_no;
-                       x->XGIfb_caps = XGIfb_caps;
-                       x->XGIfb_tqlen = 512; /* yet unused */
-                       x->XGIfb_pcibus = xgi_video_info.pcibus;
-                       x->XGIfb_pcislot = xgi_video_info.pcislot;
-                       x->XGIfb_pcifunc = xgi_video_info.pcifunc;
-                       x->XGIfb_lcdpdc = XGIfb_detectedpdc;
-                       x->XGIfb_lcda = XGIfb_detectedlcda;
-                       break;
-               }
-          case XGIFB_GET_VBRSTATUS:
-               {
-                       unsigned long *vbrstatus = (unsigned long *) arg;
-                       if(XGIfb_CheckVBRetrace()) *vbrstatus = 1;
-                       else                       *vbrstatus = 0;
-               }
-          default:
-               return -EINVAL;
        }
-       DEBUGPRN("end of ioctl");
+       case FBIOGET_DISPINFO:
+               XGI_dispinfo((struct ap_data *) arg);
+               break;
+       case XGIFB_GET_INFO: /* TW: New for communication with X driver */
+       {
+               struct XGIfb_info *x = (struct XGIfb_info *) arg;
+
+               /* x->XGIfb_id = XGIFB_ID; */
+               x->XGIfb_version = VER_MAJOR;
+               x->XGIfb_revision = VER_MINOR;
+               x->XGIfb_patchlevel = VER_LEVEL;
+               x->chip_id = xgi_video_info.chip_id;
+               x->memory = xgi_video_info.video_size / 1024;
+               x->heapstart = xgi_video_info.heapstart / 1024;
+               x->fbvidmode = XGIfb_mode_no;
+               x->XGIfb_caps = XGIfb_caps;
+               x->XGIfb_tqlen = 512; /* yet unused */
+               x->XGIfb_pcibus = xgi_video_info.pcibus;
+               x->XGIfb_pcislot = xgi_video_info.pcislot;
+               x->XGIfb_pcifunc = xgi_video_info.pcifunc;
+               x->XGIfb_lcdpdc = XGIfb_detectedpdc;
+               x->XGIfb_lcda = XGIfb_detectedlcda;
+               break;
+       }
+       case XGIFB_GET_VBRSTATUS: {
+               unsigned long *vbrstatus = (unsigned long *) arg;
+               if (XGIfb_CheckVBRetrace())
+                       *vbrstatus = 1;
+               else
+                       *vbrstatus = 0;
+       }
+       default:
+               return -EINVAL;
+       } DEBUGPRN("end of ioctl");
        return 0;
 
 }
 
-
-
 /* ----------- FBDev related routines for all series ---------- */
 
 static int XGIfb_get_fix(struct fb_fix_screeninfo *fix, int con,
-                        struct fb_info *info)
+               struct fb_info *info)
 {
        DEBUGPRN("inside get_fix");
        memset(fix, 0, sizeof(struct fb_fix_screeninfo));
@@ -1668,175 +1695,168 @@ static int XGIfb_get_fix(struct fb_fix_screeninfo *fix, int con,
 
        fix->smem_len = xgi_video_info.video_size;
 
-
-/*        if((!XGIfb_mem) || (XGIfb_mem > (xgi_video_info.video_size/1024))) {
-           if (xgi_video_info.video_size > 0x1000000) {
-               fix->smem_len = 0xD00000;
-           } else if (xgi_video_info.video_size > 0x800000)
-               fix->smem_len = 0x800000;
-           else
-               fix->smem_len = 0x400000;
-        } else
-               fix->smem_len = XGIfb_mem * 1024;
-*/
-       fix->type        = video_type;
-       fix->type_aux    = 0;
-       if(xgi_video_info.video_bpp == 8)
+       /*        if((!XGIfb_mem) || (XGIfb_mem > (xgi_video_info.video_size/1024))) {
+        if (xgi_video_info.video_size > 0x1000000) {
+        fix->smem_len = 0xD00000;
+        } else if (xgi_video_info.video_size > 0x800000)
+        fix->smem_len = 0x800000;
+        else
+        fix->smem_len = 0x400000;
+        } else
+        fix->smem_len = XGIfb_mem * 1024;
+        */
+       fix->type = video_type;
+       fix->type_aux = 0;
+       if (xgi_video_info.video_bpp == 8)
                fix->visual = FB_VISUAL_PSEUDOCOLOR;
        else
                fix->visual = FB_VISUAL_DIRECTCOLOR;
-       fix->xpanstep    = 0;
+       fix->xpanstep = 0;
 #ifdef XGIFB_PAN
-        if(XGIfb_ypan)          fix->ypanstep = 1;
+       if (XGIfb_ypan)
+               fix->ypanstep = 1;
 #endif
-       fix->ywrapstep   = 0;
+       fix->ywrapstep = 0;
        fix->line_length = xgi_video_info.video_linelength;
-       fix->mmio_start  = xgi_video_info.mmio_base;
-       fix->mmio_len    = XGIfb_mmio_size;
-    if(xgi_video_info.chip >= XG40)
-          fix->accel    = FB_ACCEL_XGI_XABRE;
+       fix->mmio_start = xgi_video_info.mmio_base;
+       fix->mmio_len = XGIfb_mmio_size;
+       if (xgi_video_info.chip >= XG40)
+               fix->accel = FB_ACCEL_XGI_XABRE;
        else
-          fix->accel    = FB_ACCEL_XGI_GLAMOUR_2;
-
+               fix->accel = FB_ACCEL_XGI_GLAMOUR_2;
 
        DEBUGPRN("end of get_fix");
        return 0;
 }
 
-
 static struct fb_ops XGIfb_ops = {
-       .owner        = THIS_MODULE,
-       .fb_open      = XGIfb_open,
-       .fb_release   = XGIfb_release,
+       .owner = THIS_MODULE,
+       .fb_open = XGIfb_open,
+       .fb_release = XGIfb_release,
        .fb_check_var = XGIfb_check_var,
-       .fb_set_par   = XGIfb_set_par,
+       .fb_set_par = XGIfb_set_par,
        .fb_setcolreg = XGIfb_setcolreg,
 #ifdef XGIFB_PAN
-        .fb_pan_display = XGIfb_pan_display,
+       .fb_pan_display = XGIfb_pan_display,
 #endif
-        .fb_blank     = XGIfb_blank,
-       .fb_fillrect  = fbcon_XGI_fillrect,
-       .fb_copyarea  = fbcon_XGI_copyarea,
+       .fb_blank = XGIfb_blank,
+       .fb_fillrect = fbcon_XGI_fillrect,
+       .fb_copyarea = fbcon_XGI_copyarea,
        .fb_imageblit = cfb_imageblit,
-       .fb_sync      = fbcon_XGI_sync,
-       .fb_ioctl     = XGIfb_ioctl,
-//     .fb_mmap      = XGIfb_mmap,
+       .fb_sync = fbcon_XGI_sync,
+       .fb_ioctl = XGIfb_ioctl,
+       /* .fb_mmap = XGIfb_mmap, */
 };
 
 /* ---------------- Chip generation dependent routines ---------------- */
 
-
 /* for XGI 315/550/650/740/330 */
 
 static int XGIfb_get_dram_size(void)
 {
 
-       u8  ChannelNum,tmp;
-       u8  reg = 0;
+       u8 ChannelNum, tmp;
+       u8 reg = 0;
 
        /* xorg driver sets 32MB * 1 channel */
        if (xgi_video_info.chip == XG27)
                outXGIIDXREG(XGISR, IND_XGI_DRAM_SIZE, 0x51);
 
-               inXGIIDXREG(XGISR, IND_XGI_DRAM_SIZE, reg);
-               switch ((reg & XGI_DRAM_SIZE_MASK) >> 4) {
-                  case XGI_DRAM_SIZE_1MB:
-                       xgi_video_info.video_size = 0x100000;
-                       break;
-                  case XGI_DRAM_SIZE_2MB:
-                       xgi_video_info.video_size = 0x200000;
-                       break;
-                  case XGI_DRAM_SIZE_4MB:
-                       xgi_video_info.video_size = 0x400000;
-                       break;
-                  case XGI_DRAM_SIZE_8MB:
-                       xgi_video_info.video_size = 0x800000;
-                       break;
-                  case XGI_DRAM_SIZE_16MB:
-                       xgi_video_info.video_size = 0x1000000;
-                       break;
-                  case XGI_DRAM_SIZE_32MB:
-                       xgi_video_info.video_size = 0x2000000;
-                       break;
-                  case XGI_DRAM_SIZE_64MB:
-                       xgi_video_info.video_size = 0x4000000;
-                       break;
-                  case XGI_DRAM_SIZE_128MB:
-                       xgi_video_info.video_size = 0x8000000;
-                       break;
-                  case XGI_DRAM_SIZE_256MB:
-                       xgi_video_info.video_size = 0x10000000;
-                       break;
-                  default:
-                       return -1;
-               }
+       inXGIIDXREG(XGISR, IND_XGI_DRAM_SIZE, reg);
+       switch ((reg & XGI_DRAM_SIZE_MASK) >> 4) {
+       case XGI_DRAM_SIZE_1MB:
+               xgi_video_info.video_size = 0x100000;
+               break;
+       case XGI_DRAM_SIZE_2MB:
+               xgi_video_info.video_size = 0x200000;
+               break;
+       case XGI_DRAM_SIZE_4MB:
+               xgi_video_info.video_size = 0x400000;
+               break;
+       case XGI_DRAM_SIZE_8MB:
+               xgi_video_info.video_size = 0x800000;
+               break;
+       case XGI_DRAM_SIZE_16MB:
+               xgi_video_info.video_size = 0x1000000;
+               break;
+       case XGI_DRAM_SIZE_32MB:
+               xgi_video_info.video_size = 0x2000000;
+               break;
+       case XGI_DRAM_SIZE_64MB:
+               xgi_video_info.video_size = 0x4000000;
+               break;
+       case XGI_DRAM_SIZE_128MB:
+               xgi_video_info.video_size = 0x8000000;
+               break;
+       case XGI_DRAM_SIZE_256MB:
+               xgi_video_info.video_size = 0x10000000;
+               break;
+       default:
+               return -1;
+       }
 
-               tmp = (reg & 0x0c) >> 2;
-               switch(xgi_video_info.chip)
-               {
-                   case XG20:
-                    case XG21:
-                   case XG27:
-                       ChannelNum = 1;
-                       break;
-
-                   case XG42:
-                       if(reg & 0x04)
-                           ChannelNum = 2;
-                       else
-                           ChannelNum = 1;
-                       break;
-
-                   case XG45:
-                       if(tmp == 1)
-                    ChannelNum = 2;
-                else
-                if(tmp == 2)
-                    ChannelNum = 3;
-                else
-                if(tmp == 3)
-                    ChannelNum = 4;
-                else
-                    ChannelNum = 1;
-                       break;
-
-                   case XG40:
-                   default:
-                if(tmp == 2)
-                    ChannelNum = 2;
-                else
-                if(tmp == 3)
-                    ChannelNum = 3;
-                else
-                    ChannelNum = 1;
-                       break;
-               }
+       tmp = (reg & 0x0c) >> 2;
+       switch (xgi_video_info.chip) {
+       case XG20:
+       case XG21:
+       case XG27:
+               ChannelNum = 1;
+               break;
 
+       case XG42:
+               if (reg & 0x04)
+                       ChannelNum = 2;
+               else
+                       ChannelNum = 1;
+               break;
 
-               xgi_video_info.video_size = xgi_video_info.video_size * ChannelNum;
-               //PLiad fixed for benchmarking and fb set
-               //xgi_video_info.video_size = 0x200000;//1024x768x16
-               //xgi_video_info.video_size = 0x1000000;//benchmark
+       case XG45:
+               if (tmp == 1)
+                       ChannelNum = 2;
+               else if (tmp == 2)
+                       ChannelNum = 3;
+               else if (tmp == 3)
+                       ChannelNum = 4;
+               else
+                       ChannelNum = 1;
+               break;
 
-               printk("XGIfb: SR14=%x DramSzie %x ChannelNum %x\n",reg,xgi_video_info.video_size ,ChannelNum );
-               return 0;
+       case XG40:
+       default:
+               if (tmp == 2)
+                       ChannelNum = 2;
+               else if (tmp == 3)
+                       ChannelNum = 3;
+               else
+                       ChannelNum = 1;
+               break;
+       }
+
+       xgi_video_info.video_size = xgi_video_info.video_size * ChannelNum;
+       /* PLiad fixed for benchmarking and fb set */
+       /* xgi_video_info.video_size = 0x200000; */ /* 1024x768x16 */
+       /* xgi_video_info.video_size = 0x1000000; */ /* benchmark */
+
+       printk("XGIfb: SR14=%x DramSzie %x ChannelNum %x\n", reg,
+                       xgi_video_info.video_size, ChannelNum);
+       return 0;
 
 }
 
 static void XGIfb_detect_VB(void)
 {
-       u8 cr32, temp=0;
+       u8 cr32, temp = 0;
 
        xgi_video_info.TV_plug = xgi_video_info.TV_type = 0;
 
-        switch(xgi_video_info.hasVB) {
-         case HASVB_LVDS_CHRONTEL:
-         case HASVB_CHRONTEL:
-            break;
-         case HASVB_301:
-         case HASVB_302:
-//          XGI_Sense30x(); //Yi-Lin TV Sense?
-            break;
+       switch (xgi_video_info.hasVB) {
+       case HASVB_LVDS_CHRONTEL:
+       case HASVB_CHRONTEL:
+               break;
+       case HASVB_301:
+       case HASVB_302:
+               /* XGI_Sense30x(); */ /* Yi-Lin TV Sense? */
+               break;
        }
 
        inXGIIDXREG(XGICR, IND_XGI_SCRATCH_REG_CR32, cr32);
@@ -1862,45 +1882,47 @@ static void XGIfb_detect_VB(void)
        else
                xgi_video_info.disp_state = 0;
 
-       if(XGIfb_tvplug != -1)
+       if (XGIfb_tvplug != -1)
                /* PR/TW: Override with option */
-               xgi_video_info.TV_plug = XGIfb_tvplug;
+               xgi_video_info.TV_plug = XGIfb_tvplug;
        else if (cr32 & XGI_VB_HIVISION) {
                xgi_video_info.TV_type = TVMODE_HIVISION;
                xgi_video_info.TV_plug = TVPLUG_SVIDEO;
-       }
-       else if (cr32 & XGI_VB_SVIDEO)
+       } else if (cr32 & XGI_VB_SVIDEO)
                xgi_video_info.TV_plug = TVPLUG_SVIDEO;
        else if (cr32 & XGI_VB_COMPOSITE)
                xgi_video_info.TV_plug = TVPLUG_COMPOSITE;
        else if (cr32 & XGI_VB_SCART)
                xgi_video_info.TV_plug = TVPLUG_SCART;
 
-       if(xgi_video_info.TV_type == 0) {
-           /* TW: PAL/NTSC changed for 650 */
-           if((xgi_video_info.chip <= XGI_315PRO) || (xgi_video_info.chip >= XGI_330)) {
+       if (xgi_video_info.TV_type == 0) {
+               /* TW: PAL/NTSC changed for 650 */
+               if ((xgi_video_info.chip <= XGI_315PRO) || (xgi_video_info.chip
+                               >= XGI_330)) {
 
-                inXGIIDXREG(XGICR, 0x38, temp);
-               if(temp & 0x10)
-                       xgi_video_info.TV_type = TVMODE_PAL;
-               else
-                       xgi_video_info.TV_type = TVMODE_NTSC;
+                       inXGIIDXREG(XGICR, 0x38, temp);
+                       if (temp & 0x10)
+                               xgi_video_info.TV_type = TVMODE_PAL;
+                       else
+                               xgi_video_info.TV_type = TVMODE_NTSC;
 
-           } else {
+               } else {
 
-               inXGIIDXREG(XGICR, 0x79, temp);
-               if(temp & 0x20)
-                       xgi_video_info.TV_type = TVMODE_PAL;
-               else
-                       xgi_video_info.TV_type = TVMODE_NTSC;
-           }
+                       inXGIIDXREG(XGICR, 0x79, temp);
+                       if (temp & 0x20)
+                               xgi_video_info.TV_type = TVMODE_PAL;
+                       else
+                               xgi_video_info.TV_type = TVMODE_NTSC;
+               }
        }
 
        /* TW: Copy forceCRT1 option to CRT1off if option is given */
-       if (XGIfb_forcecrt1 != -1) {
-               if (XGIfb_forcecrt1) XGIfb_crt1off = 0;
-               else                 XGIfb_crt1off = 1;
-       }
+       if (XGIfb_forcecrt1 != -1) {
+               if (XGIfb_forcecrt1)
+                       XGIfb_crt1off = 0;
+               else
+                       XGIfb_crt1off = 1;
+       }
 }
 
 static void XGIfb_get_VB_type(void)
@@ -1908,202 +1930,211 @@ static void XGIfb_get_VB_type(void)
        u8 reg;
 
        if (!XGIfb_has_VB()) {
-               inXGIIDXREG(XGICR, IND_XGI_SCRATCH_REG_CR37, reg);
+               inXGIIDXREG(XGICR, IND_XGI_SCRATCH_REG_CR37, reg);
                switch ((reg & XGI_EXTERNAL_CHIP_MASK) >> 1) {
-                  case XGI310_EXTERNAL_CHIP_LVDS:
+               case XGI310_EXTERNAL_CHIP_LVDS:
                        xgi_video_info.hasVB = HASVB_LVDS;
                        break;
-                  case XGI310_EXTERNAL_CHIP_LVDS_CHRONTEL:
+               case XGI310_EXTERNAL_CHIP_LVDS_CHRONTEL:
                        xgi_video_info.hasVB = HASVB_LVDS_CHRONTEL;
                        break;
-                  default:
+               default:
                        break;
                }
        }
 }
 
-
 static int XGIfb_has_VB(void)
 {
        u8 vb_chipid;
 
        inXGIIDXREG(XGIPART4, 0x00, vb_chipid);
        switch (vb_chipid) {
-          case 0x01:
+       case 0x01:
                xgi_video_info.hasVB = HASVB_301;
                break;
-          case 0x02:
+       case 0x02:
                xgi_video_info.hasVB = HASVB_302;
                break;
-          default:
+       default:
                xgi_video_info.hasVB = HASVB_NONE;
                return 0;
        }
        return 1;
 }
 
-
-
 /* ------------------ Sensing routines ------------------ */
 
 /* TW: Determine and detect attached devices on XGI30x */
-int
-XGIDoSense(int tempbl, int tempbh, int tempcl, int tempch)
+int XGIDoSense(int tempbl, int tempbh, int tempcl, int tempch)
 {
-    int temp,i;
-
-    outXGIIDXREG(XGIPART4,0x11,tempbl);
-    temp = tempbh | tempcl;
-    setXGIIDXREG(XGIPART4,0x10,0xe0,temp);
-    for(i=0; i<10; i++) XGI_LongWait(&XGI_Pr);
-    tempch &= 0x7f;
-    inXGIIDXREG(XGIPART4,0x03,temp);
-    temp ^= 0x0e;
-    temp &= tempch;
-    return(temp);
+       int temp, i;
+
+       outXGIIDXREG(XGIPART4, 0x11, tempbl);
+       temp = tempbh | tempcl;
+       setXGIIDXREG(XGIPART4, 0x10, 0xe0, temp);
+       for (i = 0; i < 10; i++)
+               XGI_LongWait(&XGI_Pr);
+       tempch &= 0x7f;
+       inXGIIDXREG(XGIPART4, 0x03, temp);
+       temp ^= 0x0e;
+       temp &= tempch;
+       return temp;
 }
 
-void
-XGI_Sense30x(void)
+void XGI_Sense30x(void)
 {
-  u8 backupP4_0d;
-  u8 testsvhs_tempbl, testsvhs_tempbh;
-  u8 testsvhs_tempcl, testsvhs_tempch;
-  u8 testcvbs_tempbl, testcvbs_tempbh;
-  u8 testcvbs_tempcl, testcvbs_tempch;
-  u8 testvga2_tempbl, testvga2_tempbh;
-  u8 testvga2_tempcl, testvga2_tempch;
-  int myflag, result;
-
-  inXGIIDXREG(XGIPART4,0x0d,backupP4_0d);
-  outXGIIDXREG(XGIPART4,0x0d,(backupP4_0d | 0x04));
-
-
-
-       testvga2_tempbh = 0x00; testvga2_tempbl = 0xd1;
-        testsvhs_tempbh = 0x00; testsvhs_tempbl = 0xb9;
-       testcvbs_tempbh = 0x00; testcvbs_tempbl = 0xb3;
-       if((XGIhw_ext.ujVBChipID != VB_CHIP_301) &&
-          (XGIhw_ext.ujVBChipID != VB_CHIP_302)) {
-             testvga2_tempbh = 0x01; testvga2_tempbl = 0x90;
-             testsvhs_tempbh = 0x01; testsvhs_tempbl = 0x6b;
-             testcvbs_tempbh = 0x01; testcvbs_tempbl = 0x74;
-             if(XGIhw_ext.ujVBChipID == VB_CHIP_301LV ||
-                XGIhw_ext.ujVBChipID == VB_CHIP_302LV) {
-                testvga2_tempbh = 0x00; testvga2_tempbl = 0x00;
-                testsvhs_tempbh = 0x02; testsvhs_tempbl = 0x00;
-                testcvbs_tempbh = 0x01; testcvbs_tempbl = 0x00;
-             }
-       }
-       if(XGIhw_ext.ujVBChipID != VB_CHIP_301LV &&
-          XGIhw_ext.ujVBChipID != VB_CHIP_302LV) {
-          inXGIIDXREG(XGIPART4,0x01,myflag);
-          if(myflag & 0x04) {
-             testvga2_tempbh = 0x00; testvga2_tempbl = 0xfd;
-             testsvhs_tempbh = 0x00; testsvhs_tempbl = 0xdd;
-             testcvbs_tempbh = 0x00; testcvbs_tempbl = 0xee;
-          }
-       }
-       if((XGIhw_ext.ujVBChipID == VB_CHIP_301LV) ||
-          (XGIhw_ext.ujVBChipID == VB_CHIP_302LV) ) {
-          testvga2_tempbh = 0x00; testvga2_tempbl = 0x00;
-          testvga2_tempch = 0x00; testvga2_tempcl = 0x00;
-          testsvhs_tempch = 0x04; testsvhs_tempcl = 0x08;
-          testcvbs_tempch = 0x08; testcvbs_tempcl = 0x08;
+       u8 backupP4_0d;
+       u8 testsvhs_tempbl, testsvhs_tempbh;
+       u8 testsvhs_tempcl, testsvhs_tempch;
+       u8 testcvbs_tempbl, testcvbs_tempbh;
+       u8 testcvbs_tempcl, testcvbs_tempch;
+       u8 testvga2_tempbl, testvga2_tempbh;
+       u8 testvga2_tempcl, testvga2_tempch;
+       int myflag, result;
+
+       inXGIIDXREG(XGIPART4, 0x0d, backupP4_0d);
+       outXGIIDXREG(XGIPART4, 0x0d, (backupP4_0d | 0x04));
+
+       testvga2_tempbh = 0x00;
+       testvga2_tempbl = 0xd1;
+       testsvhs_tempbh = 0x00;
+       testsvhs_tempbl = 0xb9;
+       testcvbs_tempbh = 0x00;
+       testcvbs_tempbl = 0xb3;
+       if ((XGIhw_ext.ujVBChipID != VB_CHIP_301) && (XGIhw_ext.ujVBChipID
+                       != VB_CHIP_302)) {
+               testvga2_tempbh = 0x01;
+               testvga2_tempbl = 0x90;
+               testsvhs_tempbh = 0x01;
+               testsvhs_tempbl = 0x6b;
+               testcvbs_tempbh = 0x01;
+               testcvbs_tempbl = 0x74;
+               if (XGIhw_ext.ujVBChipID == VB_CHIP_301LV
+                               || XGIhw_ext.ujVBChipID == VB_CHIP_302LV) {
+                       testvga2_tempbh = 0x00;
+                       testvga2_tempbl = 0x00;
+                       testsvhs_tempbh = 0x02;
+                       testsvhs_tempbl = 0x00;
+                       testcvbs_tempbh = 0x01;
+                       testcvbs_tempbl = 0x00;
+               }
+       }
+       if (XGIhw_ext.ujVBChipID != VB_CHIP_301LV && XGIhw_ext.ujVBChipID
+                       != VB_CHIP_302LV) {
+               inXGIIDXREG(XGIPART4, 0x01, myflag);
+               if (myflag & 0x04) {
+                       testvga2_tempbh = 0x00;
+                       testvga2_tempbl = 0xfd;
+                       testsvhs_tempbh = 0x00;
+                       testsvhs_tempbl = 0xdd;
+                       testcvbs_tempbh = 0x00;
+                       testcvbs_tempbl = 0xee;
+               }
+       }
+       if ((XGIhw_ext.ujVBChipID == VB_CHIP_301LV) || (XGIhw_ext.ujVBChipID
+                       == VB_CHIP_302LV)) {
+               testvga2_tempbh = 0x00;
+               testvga2_tempbl = 0x00;
+               testvga2_tempch = 0x00;
+               testvga2_tempcl = 0x00;
+               testsvhs_tempch = 0x04;
+               testsvhs_tempcl = 0x08;
+               testcvbs_tempch = 0x08;
+               testcvbs_tempcl = 0x08;
        } else {
-          testvga2_tempch = 0x0e; testvga2_tempcl = 0x08;
-          testsvhs_tempch = 0x06; testsvhs_tempcl = 0x04;
-          testcvbs_tempch = 0x08; testcvbs_tempcl = 0x04;
-       }
-
-
-    if(testvga2_tempch || testvga2_tempcl || testvga2_tempbh || testvga2_tempbl) {
-        result = XGIDoSense(testvga2_tempbl, testvga2_tempbh,
-                            testvga2_tempcl, testvga2_tempch);
-       if(result) {
-               printk(KERN_INFO "XGIfb: Detected secondary VGA connection\n");
-               orXGIIDXREG(XGICR, 0x32, 0x10);
-       }
-    }
-
-    result = XGIDoSense(testsvhs_tempbl, testsvhs_tempbh,
-                        testsvhs_tempcl, testsvhs_tempch);
-    if(result) {
-        printk(KERN_INFO "XGIfb: Detected TV connected to SVHS output\n");
-        /* TW: So we can be sure that there IS a SVHS output */
-       xgi_video_info.TV_plug = TVPLUG_SVIDEO;
-       orXGIIDXREG(XGICR, 0x32, 0x02);
-    }
-
-    if(!result) {
-        result = XGIDoSense(testcvbs_tempbl, testcvbs_tempbh,
-                           testcvbs_tempcl, testcvbs_tempch);
-       if(result) {
-           printk(KERN_INFO "XGIfb: Detected TV connected to CVBS output\n");
-           /* TW: So we can be sure that there IS a CVBS output */
-           xgi_video_info.TV_plug = TVPLUG_COMPOSITE;
-           orXGIIDXREG(XGICR, 0x32, 0x01);
-       }
-    }
-    XGIDoSense(0, 0, 0, 0);
-
-    outXGIIDXREG(XGIPART4,0x0d,backupP4_0d);
-}
+               testvga2_tempch = 0x0e;
+               testvga2_tempcl = 0x08;
+               testsvhs_tempch = 0x06;
+               testsvhs_tempcl = 0x04;
+               testcvbs_tempch = 0x08;
+               testcvbs_tempcl = 0x04;
+       }
+
+       if (testvga2_tempch || testvga2_tempcl || testvga2_tempbh
+                       || testvga2_tempbl) {
+               result = XGIDoSense(testvga2_tempbl, testvga2_tempbh,
+                               testvga2_tempcl, testvga2_tempch);
+               if (result) {
+                       printk(KERN_INFO "XGIfb: Detected secondary VGA connection\n");
+                       orXGIIDXREG(XGICR, 0x32, 0x10);
+               }
+       }
 
+       result = XGIDoSense(testsvhs_tempbl, testsvhs_tempbh, testsvhs_tempcl,
+                       testsvhs_tempch);
+       if (result) {
+               printk(KERN_INFO "XGIfb: Detected TV connected to SVHS output\n");
+               /* TW: So we can be sure that there IS a SVHS output */
+               xgi_video_info.TV_plug = TVPLUG_SVIDEO;
+               orXGIIDXREG(XGICR, 0x32, 0x02);
+       }
+
+       if (!result) {
+               result = XGIDoSense(testcvbs_tempbl, testcvbs_tempbh,
+                               testcvbs_tempcl, testcvbs_tempch);
+               if (result) {
+                       printk(KERN_INFO "XGIfb: Detected TV connected to CVBS output\n");
+                       /* TW: So we can be sure that there IS a CVBS output */
+                       xgi_video_info.TV_plug = TVPLUG_COMPOSITE;
+                       orXGIIDXREG(XGICR, 0x32, 0x01);
+               }
+       }
+       XGIDoSense(0, 0, 0, 0);
 
+       outXGIIDXREG(XGIPART4, 0x0d, backupP4_0d);
+}
 
 /* ------------------------ Heap routines -------------------------- */
 
 static int XGIfb_heap_init(void)
 {
        XGI_OH *poh;
-       u8 temp=0;
+       u8 temp = 0;
 
-       int            agp_enabled = 1;
-       u32            agp_size;
+       int agp_enabled = 1;
+       u32 agp_size;
        unsigned long *cmdq_baseport = NULL;
        unsigned long *read_port = NULL;
        unsigned long *write_port = NULL;
-       XGI_CMDTYPE    cmd_type;
+       XGI_CMDTYPE cmd_type;
 #ifndef AGPOFF
-       struct agp_kern_info  *agp_info;
-       struct agp_memory     *agp;
-       u32            agp_phys;
+       struct agp_kern_info *agp_info;
+       struct agp_memory *agp;
+       u32 agp_phys;
 #endif
 
-/* TW: The heap start is either set manually using the "mem" parameter, or
- *     defaults as follows:
- *     -) If more than 16MB videoRAM available, let our heap start at 12MB.
- *     -) If more than  8MB videoRAM available, let our heap start at  8MB.
- *     -) If 4MB or less is available, let it start at 4MB.
- *     This is for avoiding a clash with X driver which uses the beginning
- *     of the videoRAM. To limit size of X framebuffer, use Option MaxXFBMem
- *     in XF86Config-4.
- *     The heap start can also be specified by parameter "mem" when starting the XGIfb
- *     driver. XGIfb mem=1024 lets heap starts at 1MB, etc.
- */
-     if ((!XGIfb_mem) || (XGIfb_mem > (xgi_video_info.video_size/1024))) {
-        if (xgi_video_info.video_size > 0x1000000) {
-               xgi_video_info.heapstart = 0xD00000;
-       } else if (xgi_video_info.video_size > 0x800000) {
-               xgi_video_info.heapstart = 0x800000;
+       /* TW: The heap start is either set manually using the "mem" parameter, or
+        *     defaults as follows:
+        *     -) If more than 16MB videoRAM available, let our heap start at 12MB.
+        *     -) If more than  8MB videoRAM available, let our heap start at  8MB.
+        *     -) If 4MB or less is available, let it start at 4MB.
+        *     This is for avoiding a clash with X driver which uses the beginning
+        *     of the videoRAM. To limit size of X framebuffer, use Option MaxXFBMem
+        *     in XF86Config-4.
+        *     The heap start can also be specified by parameter "mem" when starting the XGIfb
+        *     driver. XGIfb mem=1024 lets heap starts at 1MB, etc.
+        */
+       if ((!XGIfb_mem) || (XGIfb_mem > (xgi_video_info.video_size / 1024))) {
+               if (xgi_video_info.video_size > 0x1000000)
+                       xgi_video_info.heapstart = 0xD00000;
+               else if (xgi_video_info.video_size > 0x800000)
+                       xgi_video_info.heapstart = 0x800000;
+               else
+                       xgi_video_info.heapstart = 0x400000;
        } else {
-               xgi_video_info.heapstart = 0x400000;
+               xgi_video_info.heapstart = XGIfb_mem * 1024;
        }
-     } else {
-           xgi_video_info.heapstart = XGIfb_mem * 1024;
-     }
-     XGIfb_heap_start =
-              (unsigned long) (xgi_video_info.video_vbase + xgi_video_info.heapstart);
-     printk(KERN_INFO "XGIfb: Memory heap starting at %dK\n",
-                                       (int)(xgi_video_info.heapstart / 1024));
+       XGIfb_heap_start = (unsigned long) (xgi_video_info.video_vbase
+                       + xgi_video_info.heapstart);
+       printk(KERN_INFO "XGIfb: Memory heap starting at %dK\n",
+                       (int)(xgi_video_info.heapstart / 1024));
 
-     XGIfb_heap_end = (unsigned long) xgi_video_info.video_vbase + xgi_video_info.video_size;
-     XGIfb_heap_size = XGIfb_heap_end - XGIfb_heap_start;
+       XGIfb_heap_end = (unsigned long) xgi_video_info.video_vbase
+                       + xgi_video_info.video_size;
+       XGIfb_heap_size = XGIfb_heap_end - XGIfb_heap_start;
 
-
-
-        /* TW: Now initialize the 310 series' command queue mode.
+       /* TW: Now initialize the 310 series' command queue mode.
         * On 310/325, there are three queue modes available which
         * are chosen by setting bits 7:5 in SR26:
         * 1. MMIO queue mode (bit 5, 0x20). The hardware will keep
@@ -2133,25 +2164,28 @@ static int XGIfb_heap_init(void)
         *    11  (0x0C)  4M
         * The queue location is to be written to 0x85C0.
         *
-         */
-       cmdq_baseport = (unsigned long *)(xgi_video_info.mmio_vbase + MMIO_QUEUE_PHYBASE);
-       write_port    = (unsigned long *)(xgi_video_info.mmio_vbase + MMIO_QUEUE_WRITEPORT);
-       read_port     = (unsigned long *)(xgi_video_info.mmio_vbase + MMIO_QUEUE_READPORT);
+        */
+       cmdq_baseport = (unsigned long *) (xgi_video_info.mmio_vbase
+                       + MMIO_QUEUE_PHYBASE);
+       write_port = (unsigned long *) (xgi_video_info.mmio_vbase
+                       + MMIO_QUEUE_WRITEPORT);
+       read_port = (unsigned long *) (xgi_video_info.mmio_vbase
+                       + MMIO_QUEUE_READPORT);
 
        DPRINTK("AGP base: 0x%p, read: 0x%p, write: 0x%p\n", cmdq_baseport, read_port, write_port);
 
-       agp_size  = COMMAND_QUEUE_AREA_SIZE;
+       agp_size = COMMAND_QUEUE_AREA_SIZE;
 
 #ifndef AGPOFF
        if (XGIfb_queuemode == AGP_CMD_QUEUE) {
                agp_info = vmalloc(sizeof(*agp_info));
-               memset((void*)agp_info, 0x00, sizeof(*agp_info));
+               memset((void *)agp_info, 0x00, sizeof(*agp_info));
                agp_copy_info(agp_info);
 
                agp_backend_acquire();
 
-               agp = agp_allocate_memory(COMMAND_QUEUE_AREA_SIZE/PAGE_SIZE,
-                                         AGP_NORMAL_MEMORY);
+               agp = agp_allocate_memory(COMMAND_QUEUE_AREA_SIZE / PAGE_SIZE,
+                               AGP_NORMAL_MEMORY);
                if (agp == NULL) {
                        DPRINTK("XGIfb: Allocating AGP buffer failed.\n");
                        agp_enabled = 0;
@@ -2174,8 +2208,8 @@ static int XGIfb_heap_init(void)
        if ((agp_enabled) && (XGIfb_queuemode == AGP_CMD_QUEUE)) {
                cmd_type = AGP_CMD_QUEUE;
                printk(KERN_INFO "XGIfb: Using AGP queue mode\n");
-/*     } else if (XGIfb_heap_size >= COMMAND_QUEUE_AREA_SIZE)  */
-        } else if (XGIfb_queuemode == VM_CMD_QUEUE) {
+       /* } else if (XGIfb_heap_size >= COMMAND_QUEUE_AREA_SIZE)  */
+       } else if (XGIfb_queuemode == VM_CMD_QUEUE) {
                cmd_type = VM_CMD_QUEUE;
                printk(KERN_INFO "XGIfb: Using VRAM queue mode\n");
        } else {
@@ -2184,32 +2218,32 @@ static int XGIfb_heap_init(void)
        }
 
        switch (agp_size) {
-          case 0x80000:
+       case 0x80000:
                temp = XGI_CMD_QUEUE_SIZE_512k;
                break;
-          case 0x100000:
+       case 0x100000:
                temp = XGI_CMD_QUEUE_SIZE_1M;
                break;
-          case 0x200000:
+       case 0x200000:
                temp = XGI_CMD_QUEUE_SIZE_2M;
                break;
-          case 0x400000:
+       case 0x400000:
                temp = XGI_CMD_QUEUE_SIZE_4M;
                break;
        }
 
        switch (cmd_type) {
-          case AGP_CMD_QUEUE:
+       case AGP_CMD_QUEUE:
 #ifndef AGPOFF
                DPRINTK("XGIfb: AGP buffer base = 0x%lx, offset = 0x%x, size = %dK\n",
                        agp_info->aper_base, agp->physical, agp_size/1024);
 
                agp_phys = agp_info->aper_base + agp->physical;
 
-               outXGIIDXREG(XGICR,  IND_XGI_AGP_IO_PAD, 0);
-               outXGIIDXREG(XGICR,  IND_XGI_AGP_IO_PAD, XGI_AGP_2X);
+               outXGIIDXREG(XGICR, IND_XGI_AGP_IO_PAD, 0);
+               outXGIIDXREG(XGICR, IND_XGI_AGP_IO_PAD, XGI_AGP_2X);
 
-                outXGIIDXREG(XGISR, IND_XGI_CMDQUEUE_THRESHOLD, COMMAND_QUEUE_THRESHOLD);
+               outXGIIDXREG(XGISR, IND_XGI_CMDQUEUE_THRESHOLD, COMMAND_QUEUE_THRESHOLD);
 
                outXGIIDXREG(XGISR, IND_XGI_CMDQUEUE_SET, XGI_CMD_QUEUE_RESET);
 
@@ -2224,7 +2258,7 @@ static int XGIfb_heap_init(void)
 #endif
                break;
 
-          case VM_CMD_QUEUE:
+       case VM_CMD_QUEUE:
                XGIfb_heap_end -= COMMAND_QUEUE_AREA_SIZE;
                XGIfb_heap_size -= COMMAND_QUEUE_AREA_SIZE;
 
@@ -2245,40 +2279,37 @@ static int XGIfb_heap_init(void)
                        *cmdq_baseport, COMMAND_QUEUE_AREA_SIZE/1024);
                break;
 
-          default:  /* MMIO */
+       default: /* MMIO */
 
-//             printk("%s:%d - I'm here\n", __FUNCTION__, __LINE__);
-               /* TW: This previously only wrote XGI_MMIO_CMD_ENABLE
+               /* printk("%s:%d - I'm here\n", __FUNCTION__, __LINE__); */
+               /* TW: This previously only wrote XGI_MMIO_CMD_ENABLE
                 * to IND_XGI_CMDQUEUE_SET. I doubt that this is
                 * enough. Reserve memory in any way.
                 */
-// FIXME               XGIfb_heap_end -= COMMAND_QUEUE_AREA_SIZE;
-// FIXME               XGIfb_heap_size -= COMMAND_QUEUE_AREA_SIZE;
-// FIXME
-// FIXME               outXGIIDXREG(XGISR, IND_XGI_CMDQUEUE_THRESHOLD, COMMAND_QUEUE_THRESHOLD);
-// FIXME               outXGIIDXREG(XGISR, IND_XGI_CMDQUEUE_SET, XGI_CMD_QUEUE_RESET);
-// FIXME
-// FIXME               *write_port = *read_port;
-// FIXME
-// FIXME               /* TW: Set Auto_Correction bit */
-// FIXME               temp |= (XGI_MMIO_CMD_ENABLE | XGI_CMD_AUTO_CORR);
-// FIXME               // FIXME outXGIIDXREG(XGISR, IND_XGI_CMDQUEUE_SET, temp);
-// FIXME
-// FIXME               *cmdq_baseport = xgi_video_info.video_size - COMMAND_QUEUE_AREA_SIZE;
-// FIXME
-// FIXME               XGIfb_caps |= MMIO_CMD_QUEUE_CAP;
-// FIXME
-// FIXME               DPRINTK("XGIfb: MMIO Cmd Queue offset = 0x%lx, size is %dK\n",
-// FIXME                       *cmdq_baseport, COMMAND_QUEUE_AREA_SIZE/1024);
-               break;
-       }
-
-
-
+               /* FIXME XGIfb_heap_end -= COMMAND_QUEUE_AREA_SIZE; */
+               /* FIXME XGIfb_heap_size -= COMMAND_QUEUE_AREA_SIZE; */
+               /* FIXME */
+               /* FIXME outXGIIDXREG(XGISR, IND_XGI_CMDQUEUE_THRESHOLD, COMMAND_QUEUE_THRESHOLD); */
+               /* FIXME outXGIIDXREG(XGISR, IND_XGI_CMDQUEUE_SET, XGI_CMD_QUEUE_RESET); */
+               /* FIXME */
+               /* FIXME *write_port = *read_port; */
+               /* FIXME */
+               /* FIXME *//* TW: Set Auto_Correction bit */
+               /* FIXME temp |= (XGI_MMIO_CMD_ENABLE | XGI_CMD_AUTO_CORR); */
+               /* FIXME outXGIIDXREG(XGISR, IND_XGI_CMDQUEUE_SET, temp); */
+               /* FIXME */
+               /* FIXME *cmdq_baseport = xgi_video_info.video_size - COMMAND_QUEUE_AREA_SIZE; */
+               /* FIXME */
+               /* FIXME XGIfb_caps |= MMIO_CMD_QUEUE_CAP; */
+               /* FIXME */
+               /* FIXME DPRINTK("XGIfb: MMIO Cmd Queue offset = 0x%lx, size is %dK\n", */
+               /* FIXME        *cmdq_baseport, COMMAND_QUEUE_AREA_SIZE/1024); */
+       break;
+}
 
-     /* TW: Now reserve memory for the HWCursor. It is always located at the very
-            top of the videoRAM, right below the TB memory area (if used). */
-     if (XGIfb_heap_size >= XGIfb_hwcursor_size) {
+       /* TW: Now reserve memory for the HWCursor. It is always located at the very
+       top of the videoRAM, right below the TB memory area (if used). */
+       if (XGIfb_heap_size >= XGIfb_hwcursor_size) {
                XGIfb_heap_end -= XGIfb_hwcursor_size;
                XGIfb_heap_size -= XGIfb_hwcursor_size;
                XGIfb_hwcursor_vbase = XGIfb_heap_end;
@@ -2286,55 +2317,58 @@ static int XGIfb_heap_init(void)
                XGIfb_caps |= HW_CURSOR_CAP;
 
                DPRINTK("XGIfb: Hardware Cursor start at 0x%lx, size is %dK\n",
-                       XGIfb_heap_end, XGIfb_hwcursor_size/1024);
-     }
+                               XGIfb_heap_end, XGIfb_hwcursor_size/1024);
+       }
 
-     XGIfb_heap.poha_chain = NULL;
-     XGIfb_heap.poh_freelist = NULL;
+       XGIfb_heap.poha_chain = NULL;
+       XGIfb_heap.poh_freelist = NULL;
 
-     poh = XGIfb_poh_new_node();
+       poh = XGIfb_poh_new_node();
 
-     if(poh == NULL)  return 1;
+       if (poh == NULL)
+               return 1;
 
-     poh->poh_next = &XGIfb_heap.oh_free;
-     poh->poh_prev = &XGIfb_heap.oh_free;
-     poh->size = XGIfb_heap_end - XGIfb_heap_start + 1;
-     poh->offset = XGIfb_heap_start - (unsigned long) xgi_video_info.video_vbase;
+       poh->poh_next = &XGIfb_heap.oh_free;
+       poh->poh_prev = &XGIfb_heap.oh_free;
+       poh->size = XGIfb_heap_end - XGIfb_heap_start + 1;
+       poh->offset = XGIfb_heap_start - (unsigned long) xgi_video_info.video_vbase;
 
-     DPRINTK("XGIfb: Heap start:0x%p, end:0x%p, len=%dk\n",
+       DPRINTK("XGIfb: Heap start:0x%p, end:0x%p, len=%dk\n",
                (char *) XGIfb_heap_start, (char *) XGIfb_heap_end,
                (unsigned int) poh->size / 1024);
 
-     DPRINTK("XGIfb: First Node offset:0x%x, size:%dk\n",
+       DPRINTK("XGIfb: First Node offset:0x%x, size:%dk\n",
                (unsigned int) poh->offset, (unsigned int) poh->size / 1024);
 
-     XGIfb_heap.oh_free.poh_next = poh;
-     XGIfb_heap.oh_free.poh_prev = poh;
-     XGIfb_heap.oh_free.size = 0;
-     XGIfb_heap.max_freesize = poh->size;
+       XGIfb_heap.oh_free.poh_next = poh;
+       XGIfb_heap.oh_free.poh_prev = poh;
+       XGIfb_heap.oh_free.size = 0;
+       XGIfb_heap.max_freesize = poh->size;
 
-     XGIfb_heap.oh_used.poh_next = &XGIfb_heap.oh_used;
-     XGIfb_heap.oh_used.poh_prev = &XGIfb_heap.oh_used;
-     XGIfb_heap.oh_used.size = SENTINEL;
+       XGIfb_heap.oh_used.poh_next = &XGIfb_heap.oh_used;
+       XGIfb_heap.oh_used.poh_prev = &XGIfb_heap.oh_used;
+       XGIfb_heap.oh_used.size = SENTINEL;
 
-     return 0;
+       return 0;
 }
 
 static XGI_OH *XGIfb_poh_new_node(void)
 {
-       int           i;
+       int i;
        unsigned long cOhs;
-       XGI_OHALLOC   *poha;
-       XGI_OH        *poh;
+       XGI_OHALLOC *poha;
+       XGI_OH *poh;
 
        if (XGIfb_heap.poh_freelist == NULL) {
                poha = kmalloc(OH_ALLOC_SIZE, GFP_KERNEL);
-               if(!poha) return NULL;
+               if (!poha)
+                       return NULL;
 
                poha->poha_next = XGIfb_heap.poha_chain;
                XGIfb_heap.poha_chain = poha;
 
-               cOhs = (OH_ALLOC_SIZE - sizeof(XGI_OHALLOC)) / sizeof(XGI_OH) + 1;
+               cOhs = (OH_ALLOC_SIZE - sizeof(XGI_OHALLOC)) / sizeof(XGI_OH)
+                               + 1;
 
                poh = &poha->aoh[0];
                for (i = cOhs - 1; i != 0; i--) {
@@ -2349,19 +2383,19 @@ static XGI_OH *XGIfb_poh_new_node(void)
        poh = XGIfb_heap.poh_freelist;
        XGIfb_heap.poh_freelist = poh->poh_next;
 
-       return (poh);
+       return poh;
 }
 
 static XGI_OH *XGIfb_poh_allocate(unsigned long size)
 {
        XGI_OH *pohThis;
        XGI_OH *pohRoot;
-       int     bAllocated = 0;
+       int bAllocated = 0;
 
        if (size > XGIfb_heap.max_freesize) {
                DPRINTK("XGIfb: Can't allocate %dk size on offscreen\n",
-                       (unsigned int) size / 1024);
-               return (NULL);
+                               (unsigned int) size / 1024);
+               return NULL;
        }
 
        pohThis = XGIfb_heap.oh_free.poh_next;
@@ -2376,8 +2410,8 @@ static XGI_OH *XGIfb_poh_allocate(unsigned long size)
 
        if (!bAllocated) {
                DPRINTK("XGIfb: Can't allocate %dk size on offscreen\n",
-                       (unsigned int) size / 1024);
-               return (NULL);
+                               (unsigned int) size / 1024);
+               return NULL;
        }
 
        if (size == pohThis->size) {
@@ -2386,9 +2420,8 @@ static XGI_OH *XGIfb_poh_allocate(unsigned long size)
        } else {
                pohRoot = XGIfb_poh_new_node();
 
-               if (pohRoot == NULL) {
-                       return (NULL);
-               }
+               if (pohRoot == NULL)
+                       return NULL;
 
                pohRoot->offset = pohThis->offset;
                pohRoot->size = size;
@@ -2402,7 +2435,7 @@ static XGI_OH *XGIfb_poh_allocate(unsigned long size)
        pohThis = &XGIfb_heap.oh_used;
        XGIfb_insert_node(pohThis, pohRoot);
 
-       return (pohRoot);
+       return pohRoot;
 }
 
 static void XGIfb_delete_node(XGI_OH *poh)
@@ -2443,8 +2476,8 @@ static XGI_OH *XGIfb_poh_free(unsigned long base)
 
        poh_freed = XGIfb_heap.oh_used.poh_next;
 
-       while(poh_freed != &XGIfb_heap.oh_used) {
-               if(poh_freed->offset == base) {
+       while (poh_freed != &XGIfb_heap.oh_used) {
+               if (poh_freed->offset == base) {
                        foundNode = 1;
                        break;
                }
@@ -2452,7 +2485,8 @@ static XGI_OH *XGIfb_poh_free(unsigned long base)
                poh_freed = poh_freed->poh_next;
        }
 
-       if (!foundNode)  return (NULL);
+       if (!foundNode)
+               return NULL;
 
        XGIfb_heap.max_freesize += poh_freed->size;
 
@@ -2463,13 +2497,11 @@ static XGI_OH *XGIfb_poh_free(unsigned long base)
        pohThis = XGIfb_heap.oh_free.poh_next;
 
        while (pohThis != &XGIfb_heap.oh_free) {
-               if (pohThis->offset == ulUpper) {
+               if (pohThis->offset == ulUpper)
                        poh_next = pohThis;
-               }
-                       else if ((pohThis->offset + pohThis->size) ==
-                                ulLower) {
+               else if ((pohThis->offset + pohThis->size) == ulLower)
                        poh_prev = pohThis;
-               }
+
                pohThis = pohThis->poh_next;
        }
 
@@ -2480,30 +2512,31 @@ static XGI_OH *XGIfb_poh_free(unsigned long base)
                XGIfb_delete_node(poh_next);
                XGIfb_free_node(poh_freed);
                XGIfb_free_node(poh_next);
-               return (poh_prev);
+               return poh_prev;
        }
 
        if (poh_prev) {
                poh_prev->size += poh_freed->size;
                XGIfb_free_node(poh_freed);
-               return (poh_prev);
+               return poh_prev;
        }
 
        if (poh_next) {
                poh_next->size += poh_freed->size;
                poh_next->offset = poh_freed->offset;
                XGIfb_free_node(poh_freed);
-               return (poh_next);
+               return poh_next;
        }
 
        XGIfb_insert_node(&XGIfb_heap.oh_free, poh_freed);
 
-       return (poh_freed);
+       return poh_freed;
 }
 
 static void XGIfb_free_node(XGI_OH *poh)
 {
-       if(poh == NULL) return;
+       if (poh == NULL)
+               return;
 
        poh->poh_next = XGIfb_heap.poh_freelist;
        XGIfb_heap.poh_freelist = poh;
@@ -2516,13 +2549,13 @@ void XGI_malloc(struct XGI_memreq *req)
 
        poh = XGIfb_poh_allocate(req->size);
 
-       if(poh == NULL) {
+       if (poh == NULL) {
                req->offset = 0;
                req->size = 0;
                DPRINTK("XGIfb: Video RAM allocation failed\n");
        } else {
                DPRINTK("XGIfb: Video RAM allocation succeeded: 0x%p\n",
-                       (char *) (poh->offset + (unsigned long) xgi_video_info.video_vbase));
+                               (char *) (poh->offset + (unsigned long) xgi_video_info.video_vbase));
 
                req->offset = poh->offset;
                req->size = poh->size;
@@ -2536,9 +2569,9 @@ void XGI_free(unsigned long base)
 
        poh = XGIfb_poh_free(base);
 
-       if(poh == NULL) {
+       if (poh == NULL) {
                DPRINTK("XGIfb: XGIfb_poh_free() failed at base 0x%x\n",
-                       (unsigned int) base);
+                               (unsigned int) base);
        }
 }
 
@@ -2552,41 +2585,45 @@ static void XGIfb_pre_setmode(void)
        cr31 &= ~0x60;
 
        switch (xgi_video_info.disp_state & DISPTYPE_DISP2) {
-          case DISPTYPE_CRT2:
+       case DISPTYPE_CRT2:
                cr30 = (XGI_VB_OUTPUT_CRT2 | XGI_SIMULTANEOUS_VIEW_ENABLE);
                cr31 |= XGI_DRIVER_MODE;
                break;
-          case DISPTYPE_LCD:
-               cr30  = (XGI_VB_OUTPUT_LCD | XGI_SIMULTANEOUS_VIEW_ENABLE);
+       case DISPTYPE_LCD:
+               cr30 = (XGI_VB_OUTPUT_LCD | XGI_SIMULTANEOUS_VIEW_ENABLE);
                cr31 |= XGI_DRIVER_MODE;
                break;
-          case DISPTYPE_TV:
+       case DISPTYPE_TV:
                if (xgi_video_info.TV_type == TVMODE_HIVISION)
-                       cr30 = (XGI_VB_OUTPUT_HIVISION | XGI_SIMULTANEOUS_VIEW_ENABLE);
+                       cr30 = (XGI_VB_OUTPUT_HIVISION
+                                       | XGI_SIMULTANEOUS_VIEW_ENABLE);
                else if (xgi_video_info.TV_plug == TVPLUG_SVIDEO)
-                       cr30 = (XGI_VB_OUTPUT_SVIDEO | XGI_SIMULTANEOUS_VIEW_ENABLE);
+                       cr30 = (XGI_VB_OUTPUT_SVIDEO
+                                       | XGI_SIMULTANEOUS_VIEW_ENABLE);
                else if (xgi_video_info.TV_plug == TVPLUG_COMPOSITE)
-                       cr30 = (XGI_VB_OUTPUT_COMPOSITE | XGI_SIMULTANEOUS_VIEW_ENABLE);
+                       cr30 = (XGI_VB_OUTPUT_COMPOSITE
+                                       | XGI_SIMULTANEOUS_VIEW_ENABLE);
                else if (xgi_video_info.TV_plug == TVPLUG_SCART)
-                       cr30 = (XGI_VB_OUTPUT_SCART | XGI_SIMULTANEOUS_VIEW_ENABLE);
+                       cr30 = (XGI_VB_OUTPUT_SCART
+                                       | XGI_SIMULTANEOUS_VIEW_ENABLE);
                cr31 |= XGI_DRIVER_MODE;
 
-               if (XGIfb_tvmode == 1 || xgi_video_info.TV_type == TVMODE_PAL)
+               if (XGIfb_tvmode == 1 || xgi_video_info.TV_type == TVMODE_PAL)
                        cr31 |= 0x01;
-                else
-                        cr31 &= ~0x01;
+               else
+                       cr31 &= ~0x01;
                break;
-          default:     /* disable CRT2 */
+       default: /* disable CRT2 */
                cr30 = 0x00;
                cr31 |= (XGI_DRIVER_MODE | XGI_VB_OUTPUT_DISABLE);
        }
 
        outXGIIDXREG(XGICR, IND_XGI_SCRATCH_REG_CR30, cr30);
        outXGIIDXREG(XGICR, IND_XGI_SCRATCH_REG_CR31, cr31);
-        outXGIIDXREG(XGICR, IND_XGI_SCRATCH_REG_CR33, (XGIfb_rate_idx & 0x0F));
-
-       if(xgi_video_info.accel) XGIfb_syncaccel();
+       outXGIIDXREG(XGICR, IND_XGI_SCRATCH_REG_CR33, (XGIfb_rate_idx & 0x0F));
 
+       if (xgi_video_info.accel)
+               XGIfb_syncaccel();
 
 }
 
@@ -2594,32 +2631,33 @@ static void XGIfb_post_setmode(void)
 {
        u8 reg;
        unsigned char doit = 1;
-/*     outXGIIDXREG(XGISR,IND_XGI_PASSWORD,XGI_PASSWORD);
-       outXGIIDXREG(XGICR,0x13,0x00);
-       setXGIIDXREG(XGISR,0x0E,0xF0,0x01);
-*test**/
+       /*
+       outXGIIDXREG(XGISR,IND_XGI_PASSWORD,XGI_PASSWORD);
+       outXGIIDXREG(XGICR, 0x13, 0x00);
+       setXGIIDXREG(XGISR,0x0E, 0xF0, 0x01);
+       *test*
+       */
        if (xgi_video_info.video_bpp == 8) {
                /* TW: We can't switch off CRT1 on LVDS/Chrontel in 8bpp Modes */
-               if ((xgi_video_info.hasVB == HASVB_LVDS) || (xgi_video_info.hasVB == HASVB_LVDS_CHRONTEL)) {
+               if ((xgi_video_info.hasVB == HASVB_LVDS)
+                               || (xgi_video_info.hasVB == HASVB_LVDS_CHRONTEL)) {
                        doit = 0;
                }
                /* TW: We can't switch off CRT1 on 301B-DH in 8bpp Modes if using LCD */
-               if  (xgi_video_info.disp_state & DISPTYPE_LCD)  {
+               if (xgi_video_info.disp_state & DISPTYPE_LCD)
                        doit = 0;
-               }
        }
 
        /* TW: We can't switch off CRT1 if bridge is in slave mode */
-       if(xgi_video_info.hasVB != HASVB_NONE) {
+       if (xgi_video_info.hasVB != HASVB_NONE) {
                inXGIIDXREG(XGIPART1, 0x00, reg);
 
-
                if ((reg & 0x50) == 0x10)
                        doit = 0;
 
-
-       } else
+       } else {
                XGIfb_crt1off = 0;
+       }
 
        inXGIIDXREG(XGICR, 0x17, reg);
        if ((XGIfb_crt1off) && (doit))
@@ -2628,118 +2666,133 @@ static void XGIfb_post_setmode(void)
                reg |= 0x80;
        outXGIIDXREG(XGICR, 0x17, reg);
 
-        andXGIIDXREG(XGISR, IND_XGI_RAMDAC_CONTROL, ~0x04);
-
-       if((xgi_video_info.disp_state & DISPTYPE_TV) && (xgi_video_info.hasVB == HASVB_301)) {
-
-          inXGIIDXREG(XGIPART4, 0x01, reg);
-
-          if(reg < 0xB0) {             /* Set filter for XGI301 */
-
-               switch (xgi_video_info.video_width) {
-                  case 320:
-                       filter_tb = (xgi_video_info.TV_type == TVMODE_NTSC) ? 4 : 12;
-                       break;
-                  case 640:
-                       filter_tb = (xgi_video_info.TV_type == TVMODE_NTSC) ? 5 : 13;
-                       break;
-                  case 720:
-                       filter_tb = (xgi_video_info.TV_type == TVMODE_NTSC) ? 6 : 14;
-                       break;
-                  case 800:
-                       filter_tb = (xgi_video_info.TV_type == TVMODE_NTSC) ? 7 : 15;
-                       break;
-                  default:
-                       filter = -1;
-                       break;
-               }
-
-               orXGIIDXREG(XGIPART1, XGIfb_CRT2_write_enable, 0x01);
-
-               if(xgi_video_info.TV_type == TVMODE_NTSC) {
+       andXGIIDXREG(XGISR, IND_XGI_RAMDAC_CONTROL, ~0x04);
 
-                       andXGIIDXREG(XGIPART2, 0x3a, 0x1f);
+       if ((xgi_video_info.disp_state & DISPTYPE_TV) && (xgi_video_info.hasVB
+                       == HASVB_301)) {
 
-                       if (xgi_video_info.TV_plug == TVPLUG_SVIDEO) {
+               inXGIIDXREG(XGIPART4, 0x01, reg);
 
-                               andXGIIDXREG(XGIPART2, 0x30, 0xdf);
+               if (reg < 0xB0) { /* Set filter for XGI301 */
 
-                       } else if (xgi_video_info.TV_plug == TVPLUG_COMPOSITE) {
+                       switch (xgi_video_info.video_width) {
+                       case 320:
+                               filter_tb = (xgi_video_info.TV_type == TVMODE_NTSC) ? 4 : 12;
+                               break;
+                       case 640:
+                               filter_tb = (xgi_video_info.TV_type == TVMODE_NTSC) ? 5 : 13;
+                               break;
+                       case 720:
+                               filter_tb = (xgi_video_info.TV_type == TVMODE_NTSC) ? 6 : 14;
+                               break;
+                       case 800:
+                               filter_tb = (xgi_video_info.TV_type == TVMODE_NTSC) ? 7 : 15;
+                               break;
+                       default:
+                               filter = -1;
+                               break;
+                       }
 
-                               orXGIIDXREG(XGIPART2, 0x30, 0x20);
+                       orXGIIDXREG(XGIPART1, XGIfb_CRT2_write_enable, 0x01);
+
+                       if (xgi_video_info.TV_type == TVMODE_NTSC) {
+
+                               andXGIIDXREG(XGIPART2, 0x3a, 0x1f);
+
+                               if (xgi_video_info.TV_plug == TVPLUG_SVIDEO) {
+
+                                       andXGIIDXREG(XGIPART2, 0x30, 0xdf);
+
+                               } else if (xgi_video_info.TV_plug
+                                               == TVPLUG_COMPOSITE) {
+
+                                       orXGIIDXREG(XGIPART2, 0x30, 0x20);
+
+                                       switch (xgi_video_info.video_width) {
+                                       case 640:
+                                               outXGIIDXREG(XGIPART2, 0x35, 0xEB);
+                                               outXGIIDXREG(XGIPART2, 0x36, 0x04);
+                                               outXGIIDXREG(XGIPART2, 0x37, 0x25);
+                                               outXGIIDXREG(XGIPART2, 0x38, 0x18);
+                                               break;
+                                       case 720:
+                                               outXGIIDXREG(XGIPART2, 0x35, 0xEE);
+                                               outXGIIDXREG(XGIPART2, 0x36, 0x0C);
+                                               outXGIIDXREG(XGIPART2, 0x37, 0x22);
+                                               outXGIIDXREG(XGIPART2, 0x38, 0x08);
+                                               break;
+                                       case 800:
+                                               outXGIIDXREG(XGIPART2, 0x35, 0xEB);
+                                               outXGIIDXREG(XGIPART2, 0x36, 0x15);
+                                               outXGIIDXREG(XGIPART2, 0x37, 0x25);
+                                               outXGIIDXREG(XGIPART2, 0x38, 0xF6);
+                                               break;
+                                       }
+                               }
 
-                               switch (xgi_video_info.video_width) {
-                               case 640:
-                                       outXGIIDXREG(XGIPART2, 0x35, 0xEB);
-                                       outXGIIDXREG(XGIPART2, 0x36, 0x04);
-                                       outXGIIDXREG(XGIPART2, 0x37, 0x25);
-                                       outXGIIDXREG(XGIPART2, 0x38, 0x18);
-                                       break;
-                               case 720:
-                                       outXGIIDXREG(XGIPART2, 0x35, 0xEE);
-                                       outXGIIDXREG(XGIPART2, 0x36, 0x0C);
-                                       outXGIIDXREG(XGIPART2, 0x37, 0x22);
-                                       outXGIIDXREG(XGIPART2, 0x38, 0x08);
-                                       break;
-                               case 800:
-                                       outXGIIDXREG(XGIPART2, 0x35, 0xEB);
-                                       outXGIIDXREG(XGIPART2, 0x36, 0x15);
-                                       outXGIIDXREG(XGIPART2, 0x37, 0x25);
-                                       outXGIIDXREG(XGIPART2, 0x38, 0xF6);
-                                       break;
+                       } else if (xgi_video_info.TV_type == TVMODE_PAL) {
+
+                               andXGIIDXREG(XGIPART2, 0x3A, 0x1F);
+
+                               if (xgi_video_info.TV_plug == TVPLUG_SVIDEO) {
+
+                                       andXGIIDXREG(XGIPART2, 0x30, 0xDF);
+
+                               } else if (xgi_video_info.TV_plug
+                                               == TVPLUG_COMPOSITE) {
+
+                                       orXGIIDXREG(XGIPART2, 0x30, 0x20);
+
+                                       switch (xgi_video_info.video_width) {
+                                       case 640:
+                                               outXGIIDXREG(XGIPART2, 0x35, 0xF1);
+                                               outXGIIDXREG(XGIPART2, 0x36, 0xF7);
+                                               outXGIIDXREG(XGIPART2, 0x37, 0x1F);
+                                               outXGIIDXREG(XGIPART2, 0x38, 0x32);
+                                               break;
+                                       case 720:
+                                               outXGIIDXREG(XGIPART2, 0x35, 0xF3);
+                                               outXGIIDXREG(XGIPART2, 0x36, 0x00);
+                                               outXGIIDXREG(XGIPART2, 0x37, 0x1D);
+                                               outXGIIDXREG(XGIPART2, 0x38, 0x20);
+                                               break;
+                                       case 800:
+                                               outXGIIDXREG(XGIPART2, 0x35, 0xFC);
+                                               outXGIIDXREG(XGIPART2, 0x36, 0xFB);
+                                               outXGIIDXREG(XGIPART2, 0x37, 0x14);
+                                               outXGIIDXREG(XGIPART2, 0x38, 0x2A);
+                                               break;
+                                       }
                                }
                        }
 
-               } else if(xgi_video_info.TV_type == TVMODE_PAL) {
-
-                       andXGIIDXREG(XGIPART2, 0x3A, 0x1F);
-
-                       if (xgi_video_info.TV_plug == TVPLUG_SVIDEO) {
-
-                               andXGIIDXREG(XGIPART2, 0x30, 0xDF);
-
-                       } else if (xgi_video_info.TV_plug == TVPLUG_COMPOSITE) {
-
-                               orXGIIDXREG(XGIPART2, 0x30, 0x20);
-
-                               switch (xgi_video_info.video_width) {
-                               case 640:
-                                       outXGIIDXREG(XGIPART2, 0x35, 0xF1);
-                                       outXGIIDXREG(XGIPART2, 0x36, 0xF7);
-                                       outXGIIDXREG(XGIPART2, 0x37, 0x1F);
-                                       outXGIIDXREG(XGIPART2, 0x38, 0x32);
-                                       break;
-                               case 720:
-                                       outXGIIDXREG(XGIPART2, 0x35, 0xF3);
-                                       outXGIIDXREG(XGIPART2, 0x36, 0x00);
-                                       outXGIIDXREG(XGIPART2, 0x37, 0x1D);
-                                       outXGIIDXREG(XGIPART2, 0x38, 0x20);
-                                       break;
-                               case 800:
-                                       outXGIIDXREG(XGIPART2, 0x35, 0xFC);
-                                       outXGIIDXREG(XGIPART2, 0x36, 0xFB);
-                                       outXGIIDXREG(XGIPART2, 0x37, 0x14);
-                                       outXGIIDXREG(XGIPART2, 0x38, 0x2A);
-                                       break;
-                               }
+                       if ((filter >= 0) && (filter <= 7)) {
+                               DPRINTK("FilterTable[%d]-%d: %02x %02x %02x %02x\n", filter_tb, filter,
+                                               XGI_TV_filter[filter_tb].filter[filter][0],
+                                               XGI_TV_filter[filter_tb].filter[filter][1],
+                                               XGI_TV_filter[filter_tb].filter[filter][2],
+                                               XGI_TV_filter[filter_tb].filter[filter][3]
+                               );
+                               outXGIIDXREG(
+                                               XGIPART2,
+                                               0x35,
+                                               (XGI_TV_filter[filter_tb].filter[filter][0]));
+                               outXGIIDXREG(
+                                               XGIPART2,
+                                               0x36,
+                                               (XGI_TV_filter[filter_tb].filter[filter][1]));
+                               outXGIIDXREG(
+                                               XGIPART2,
+                                               0x37,
+                                               (XGI_TV_filter[filter_tb].filter[filter][2]));
+                               outXGIIDXREG(
+                                               XGIPART2,
+                                               0x38,
+                                               (XGI_TV_filter[filter_tb].filter[filter][3]));
                        }
-               }
 
-               if ((filter >= 0) && (filter <=7)) {
-                       DPRINTK("FilterTable[%d]-%d: %02x %02x %02x %02x\n", filter_tb, filter,
-                               XGI_TV_filter[filter_tb].filter[filter][0],
-                               XGI_TV_filter[filter_tb].filter[filter][1],
-                               XGI_TV_filter[filter_tb].filter[filter][2],
-                               XGI_TV_filter[filter_tb].filter[filter][3]
-                       );
-                       outXGIIDXREG(XGIPART2, 0x35, (XGI_TV_filter[filter_tb].filter[filter][0]));
-                       outXGIIDXREG(XGIPART2, 0x36, (XGI_TV_filter[filter_tb].filter[filter][1]));
-                       outXGIIDXREG(XGIPART2, 0x37, (XGI_TV_filter[filter_tb].filter[filter][2]));
-                       outXGIIDXREG(XGIPART2, 0x38, (XGI_TV_filter[filter_tb].filter[filter][3]));
                }
 
-            }
-
        }
 
 }
@@ -2749,18 +2802,17 @@ XGIINITSTATIC int __init XGIfb_setup(char *options)
 {
        char *this_opt;
 
-
-
        xgi_video_info.refresh_rate = 0;
 
-        printk(KERN_INFO "XGIfb: Options %s\n", options);
+       printk(KERN_INFO "XGIfb: Options %s\n", options);
 
        if (!options || !*options)
                return 0;
 
-       while((this_opt = strsep(&options, ",")) != NULL) {
+       while ((this_opt = strsep(&options, ",")) != NULL) {
 
-               if (!*this_opt) continue;
+               if (!*this_opt)
+                       continue;
 
                if (!strncmp(this_opt, "mode:", 5)) {
                        XGIfb_search_mode(this_opt + 5);
@@ -2784,44 +2836,45 @@ XGIINITSTATIC int __init XGIfb_setup(char *options)
                        XGIfb_search_crt2type(this_opt + 14);
                } else if (!strncmp(this_opt, "forcecrt1:", 10)) {
                        XGIfb_forcecrt1 = (int)simple_strtoul(this_opt + 10, NULL, 0);
-                } else if (!strncmp(this_opt, "tvmode:",7)) {
-                       XGIfb_search_tvstd(this_opt + 7);
-                } else if (!strncmp(this_opt, "tvstandard:",11)) {
+               } else if (!strncmp(this_opt, "tvmode:", 7)) {
+                       XGIfb_search_tvstd(this_opt + 7);
+               } else if (!strncmp(this_opt, "tvstandard:", 11)) {
                        XGIfb_search_tvstd(this_opt + 7);
-                } else if (!strncmp(this_opt, "mem:",4)) {
-                       XGIfb_mem = simple_strtoul(this_opt + 4, NULL, 0);
-                } else if (!strncmp(this_opt, "dstn", 4)) {
+               } else if (!strncmp(this_opt, "mem:", 4)) {
+                       XGIfb_mem = simple_strtoul(this_opt + 4, NULL, 0);
+               } else if (!strncmp(this_opt, "dstn", 4)) {
                        enable_dstn = 1;
                        /* TW: DSTN overrules forcecrt2type */
                        XGIfb_crt2type = DISPTYPE_LCD;
                } else if (!strncmp(this_opt, "queuemode:", 10)) {
                        XGIfb_search_queuemode(this_opt + 10);
                } else if (!strncmp(this_opt, "pdc:", 4)) {
-                       XGIfb_pdc = simple_strtoul(this_opt + 4, NULL, 0);
-                       if(XGIfb_pdc & ~0x3c) {
-                          printk(KERN_INFO "XGIfb: Illegal pdc parameter\n");
-                          XGIfb_pdc = 0;
-                       }
+                       XGIfb_pdc = simple_strtoul(this_opt + 4, NULL, 0);
+                       if (XGIfb_pdc & ~0x3c) {
+                               printk(KERN_INFO "XGIfb: Illegal pdc parameter\n");
+                               XGIfb_pdc = 0;
+                       }
                } else if (!strncmp(this_opt, "noaccel", 7)) {
                        XGIfb_accel = 0;
                } else if (!strncmp(this_opt, "noypan", 6)) {
-                       XGIfb_ypan = 0;
+                       XGIfb_ypan = 0;
                } else if (!strncmp(this_opt, "userom:", 7)) {
                        XGIfb_userom = (int)simple_strtoul(this_opt + 7, NULL, 0);
-//             } else if (!strncmp(this_opt, "useoem:", 7)) {
-//                     XGIfb_useoem = (int)simple_strtoul(this_opt + 7, NULL, 0);
+                       /* } else if (!strncmp(this_opt, "useoem:", 7)) { */
+                       /* XGIfb_useoem = (int)simple_strtoul(this_opt + 7, NULL, 0); */
                } else {
                        XGIfb_search_mode(this_opt);
-//                     printk(KERN_INFO "XGIfb: Invalid option %s\n", this_opt);
+                       /* printk(KERN_INFO "XGIfb: Invalid option %s\n", this_opt); */
                }
 
                /* TW: Acceleration only with MMIO mode */
-               if((XGIfb_queuemode != -1) && (XGIfb_queuemode != MMIO_CMD)) {
+               if ((XGIfb_queuemode != -1) && (XGIfb_queuemode != MMIO_CMD)) {
                        XGIfb_ypan = 0;
                        XGIfb_accel = 0;
                }
                /* TW: Panning only with acceleration */
-               if(XGIfb_accel == 0) XGIfb_ypan = 0;
+               if (XGIfb_accel == 0)
+                       XGIfb_ypan = 0;
 
        }
        printk("\nxgifb: outa xgifb_setup 3450");
@@ -2833,366 +2886,335 @@ static unsigned char VBIOS_BUF[65535];
 
 static unsigned char *attempt_map_rom(struct pci_dev *dev, void *copy_address)
 {
-    u32 rom_size      = 0;
-    u32 rom_address   = 0;
-    int j;
-
-    /*  Get the size of the expansion rom */
-    pci_write_config_dword(dev, PCI_ROM_ADDRESS, 0xFFFFFFFF);
-    pci_read_config_dword(dev, PCI_ROM_ADDRESS, &rom_size);
-    if ((rom_size & 0x01) == 0)
-    {
+       u32 rom_size = 0;
+       u32 rom_address = 0;
+       int j;
+
+       /*  Get the size of the expansion rom */
+       pci_write_config_dword(dev, PCI_ROM_ADDRESS, 0xFFFFFFFF);
+       pci_read_config_dword(dev, PCI_ROM_ADDRESS, &rom_size);
+       if ((rom_size & 0x01) == 0) {
                printk("No ROM\n");
                return NULL;
-    }
+       }
 
-    rom_size &= 0xFFFFF800;
-    rom_size = (~rom_size)+1;
+       rom_size &= 0xFFFFF800;
+       rom_size = (~rom_size) + 1;
 
-    rom_address = pci_resource_start(dev, 0);
-    if (rom_address == 0 || rom_address == 0xFFFFFFF0)
-    {
-               printk("No suitable rom address found\n"); return NULL;
-    }
+       rom_address = pci_resource_start(dev, 0);
+       if (rom_address == 0 || rom_address == 0xFFFFFFF0) {
+               printk("No suitable rom address found\n");
+               return NULL;
+       }
 
-    printk("ROM Size is %dK, Address is %x\n", rom_size/1024, rom_address);
+       printk("ROM Size is %dK, Address is %x\n", rom_size / 1024, rom_address);
 
-    /*  Map ROM */
-    pci_write_config_dword(dev, PCI_ROM_ADDRESS, rom_address | PCI_ROM_ADDRESS_ENABLE);
+       /*  Map ROM */
+       pci_write_config_dword(dev, PCI_ROM_ADDRESS, rom_address
+                       | PCI_ROM_ADDRESS_ENABLE);
 
-    /* memcpy(copy_address, rom_address, rom_size); */
-    {
+       /* memcpy(copy_address, rom_address, rom_size); */
+       {
                unsigned char *virt_addr = ioremap(rom_address, 0x8000000);
 
-               unsigned char *from = (unsigned char *)virt_addr;
-               unsigned char *to = (unsigned char *)copy_address;
-               for (j=0; j<65536 /*rom_size*/; j++) *to++ = *from++;
+               unsigned char *from = (unsigned char *) virt_addr;
+               unsigned char *to = (unsigned char *) copy_address;
+               for (j = 0; j < 65536 /*rom_size*/; j++)
+                       *to++ = *from++;
        }
 
        pci_write_config_dword(dev, PCI_ROM_ADDRESS, 0);
 
-    printk("Copy is done\n");
+       printk("Copy is done\n");
 
        return copy_address;
 }
 
 static int __devinit xgifb_probe(struct pci_dev *pdev,
-                                const struct pci_device_id *ent)
+               const struct pci_device_id *ent)
 {
        u16 reg16;
-       u8  reg, reg1;
-        u8 CR48,CR38;
+       u8 reg, reg1;
+       u8 CR48, CR38;
        if (XGIfb_off)
                return -ENXIO;
 
        XGIfb_registered = 0;
 
        memset(&XGIhw_ext, 0, sizeof(struct xgi_hw_device_info));
-         fb_info = framebuffer_alloc(sizeof(struct fb_info), &pdev->dev);
-         if(!fb_info) return -ENOMEM;
-
-       xgi_video_info.chip_id = pdev->device;
-         pci_read_config_byte(pdev, PCI_REVISION_ID,&xgi_video_info.revision_id);
-         pci_read_config_word(pdev, PCI_COMMAND, &reg16);
-         XGIhw_ext.jChipRevision = xgi_video_info.revision_id;
-         XGIvga_enabled = reg16 & 0x01;
-
-         xgi_video_info.pcibus = pdev->bus->number;
-         xgi_video_info.pcislot = PCI_SLOT(pdev->devfn);
-         xgi_video_info.pcifunc = PCI_FUNC(pdev->devfn);
-         xgi_video_info.subsysvendor = pdev->subsystem_vendor;
-         xgi_video_info.subsysdevice = pdev->subsystem_device;
-
-         xgi_video_info.video_base = pci_resource_start(pdev, 0);
-         xgi_video_info.mmio_base = pci_resource_start(pdev, 1);
-         XGIfb_mmio_size =  pci_resource_len(pdev, 1);
-         xgi_video_info.vga_base = pci_resource_start(pdev, 2) + 0x30;
-         XGIhw_ext.pjIOAddress = (unsigned char *)xgi_video_info.vga_base;
-         //XGI_Pr.RelIO  = ioremap(pci_resource_start(pdev, 2), 128) + 0x30;
-         printk("XGIfb: Relocate IO address: %lx [%08lx]\n",
-                (unsigned long)pci_resource_start(pdev, 2), XGI_Pr.RelIO);
-
-         if (pci_enable_device(pdev))
-                 return -EIO;
-
-    XGIRegInit(&XGI_Pr, (unsigned long)XGIhw_ext.pjIOAddress);
-
-    outXGIIDXREG(XGISR, IND_XGI_PASSWORD, XGI_PASSWORD);
-    inXGIIDXREG(XGISR, IND_XGI_PASSWORD, reg1);
-
-    if(reg1 != 0xa1) /*I/O error */
-    {
-         printk("\nXGIfb: I/O error!!!");
-         return  -EIO;
-    }
+       fb_info = framebuffer_alloc(sizeof(struct fb_info), &pdev->dev);
+       if (!fb_info)
+               return -ENOMEM;
+
+       xgi_video_info.chip_id = pdev->device;
+       pci_read_config_byte(pdev, PCI_REVISION_ID, &xgi_video_info.revision_id);
+       pci_read_config_word(pdev, PCI_COMMAND, &reg16);
+       XGIhw_ext.jChipRevision = xgi_video_info.revision_id;
+       XGIvga_enabled = reg16 & 0x01;
+
+       xgi_video_info.pcibus = pdev->bus->number;
+       xgi_video_info.pcislot = PCI_SLOT(pdev->devfn);
+       xgi_video_info.pcifunc = PCI_FUNC(pdev->devfn);
+       xgi_video_info.subsysvendor = pdev->subsystem_vendor;
+       xgi_video_info.subsysdevice = pdev->subsystem_device;
+
+       xgi_video_info.video_base = pci_resource_start(pdev, 0);
+       xgi_video_info.mmio_base = pci_resource_start(pdev, 1);
+       XGIfb_mmio_size = pci_resource_len(pdev, 1);
+       xgi_video_info.vga_base = pci_resource_start(pdev, 2) + 0x30;
+       XGIhw_ext.pjIOAddress = (unsigned char *)xgi_video_info.vga_base;
+       /* XGI_Pr.RelIO  = ioremap(pci_resource_start(pdev, 2), 128) + 0x30; */
+       printk("XGIfb: Relocate IO address: %lx [%08lx]\n",
+                       (unsigned long)pci_resource_start(pdev, 2), XGI_Pr.RelIO);
+
+       if (pci_enable_device(pdev))
+               return -EIO;
+
+       XGIRegInit(&XGI_Pr, (unsigned long)XGIhw_ext.pjIOAddress);
+
+       outXGIIDXREG(XGISR, IND_XGI_PASSWORD, XGI_PASSWORD);
+       inXGIIDXREG(XGISR, IND_XGI_PASSWORD, reg1);
+
+       if (reg1 != 0xa1) { /*I/O error */
+               printk("\nXGIfb: I/O error!!!");
+               return -EIO;
+       }
 
        switch (xgi_video_info.chip_id) {
-          case PCI_DEVICE_ID_XG_20:
+       case PCI_DEVICE_ID_XG_20:
                orXGIIDXREG(XGICR, Index_CR_GPIO_Reg3, GPIOG_EN);
                inXGIIDXREG(XGICR, Index_CR_GPIO_Reg1, CR48);
                if (CR48&GPIOG_READ)
                        xgi_video_info.chip = XG21;
                else
-                       xgi_video_info.chip = XG20;
+                       xgi_video_info.chip = XG20;
                XGIfb_hwcursor_size = HW_CURSOR_AREA_SIZE_315 * 2;
                XGIfb_CRT2_write_enable = IND_XGI_CRT2_WRITE_ENABLE_315;
                break;
-           case PCI_DEVICE_ID_XG_40:
+       case PCI_DEVICE_ID_XG_40:
                xgi_video_info.chip = XG40;
                XGIfb_hwcursor_size = HW_CURSOR_AREA_SIZE_315 * 2;
                XGIfb_CRT2_write_enable = IND_XGI_CRT2_WRITE_ENABLE_315;
                break;
-           case PCI_DEVICE_ID_XG_41:
+       case PCI_DEVICE_ID_XG_41:
                xgi_video_info.chip = XG41;
                XGIfb_hwcursor_size = HW_CURSOR_AREA_SIZE_315 * 2;
                XGIfb_CRT2_write_enable = IND_XGI_CRT2_WRITE_ENABLE_315;
                break;
-           case PCI_DEVICE_ID_XG_42:
+       case PCI_DEVICE_ID_XG_42:
                xgi_video_info.chip = XG42;
                XGIfb_hwcursor_size = HW_CURSOR_AREA_SIZE_315 * 2;
                XGIfb_CRT2_write_enable = IND_XGI_CRT2_WRITE_ENABLE_315;
                break;
-           case PCI_DEVICE_ID_XG_27:
+       case PCI_DEVICE_ID_XG_27:
                xgi_video_info.chip = XG27;
                XGIfb_hwcursor_size = HW_CURSOR_AREA_SIZE_315 * 2;
                XGIfb_CRT2_write_enable = IND_XGI_CRT2_WRITE_ENABLE_315;
                break;
-           default:
-               return -ENODEV;
+       default:
+               return -ENODEV;
        }
 
-       printk("XGIfb:chipid = %x\n",xgi_video_info.chip);
-        XGIhw_ext.jChipType = xgi_video_info.chip;
-
-               switch (xgi_video_info.chip) {
-                  case XG40:
-                  case XG41:
-                  case XG42:
-                  case XG45:
-                  case XG20:
-                  case XG21:
-                   case XG27:
-                          XGIhw_ext.bIntegratedMMEnabled = 1;
-                       break;
-
-                  default:
-                       break;
-               }
+       printk("XGIfb:chipid = %x\n", xgi_video_info.chip);
+       XGIhw_ext.jChipType = xgi_video_info.chip;
 
+       switch (xgi_video_info.chip) {
+       case XG40:
+       case XG41:
+       case XG42:
+       case XG45:
+       case XG20:
+       case XG21:
+       case XG27:
+               XGIhw_ext.bIntegratedMMEnabled = 1;
+               break;
+       default:
+               break;
+       }
 
-         XGIhw_ext.pDevice = NULL;
-         if ((xgi_video_info.chip == XG21) || (XGIfb_userom))
-         {
-             XGIhw_ext.pjVirtualRomBase = attempt_map_rom(pdev, VBIOS_BUF);
+       XGIhw_ext.pDevice = NULL;
+       if ((xgi_video_info.chip == XG21) || (XGIfb_userom)) {
+               XGIhw_ext.pjVirtualRomBase = attempt_map_rom(pdev, VBIOS_BUF);
 
-             if(XGIhw_ext.pjVirtualRomBase)
-                       printk(KERN_INFO "XGIfb: Video ROM found and mapped to %p\n",XGIhw_ext.pjVirtualRomBase);
+               if (XGIhw_ext.pjVirtualRomBase)
+                       printk(KERN_INFO "XGIfb: Video ROM found and mapped to %p\n", XGIhw_ext.pjVirtualRomBase);
                else
                        printk(KERN_INFO "XGIfb: Video ROM not found\n");
-    } else {
-               XGIhw_ext.pjVirtualRomBase = NULL;
+       } else {
+               XGIhw_ext.pjVirtualRomBase = NULL;
                printk(KERN_INFO "XGIfb: Video ROM usage disabled\n");
-    }
-         XGIhw_ext.pjCustomizedROMImage = NULL;
-         XGIhw_ext.bSkipDramSizing = 0;
-         XGIhw_ext.pQueryVGAConfigSpace = &XGIfb_query_VGA_config_space;
-//     XGIhw_ext.pQueryNorthBridgeSpace = &XGIfb_query_north_bridge_space;
-         strcpy(XGIhw_ext.szVBIOSVer, "0.84");
+       }
+       XGIhw_ext.pjCustomizedROMImage = NULL;
+       XGIhw_ext.bSkipDramSizing = 0;
+       XGIhw_ext.pQueryVGAConfigSpace = &XGIfb_query_VGA_config_space;
+       /* XGIhw_ext.pQueryNorthBridgeSpace = &XGIfb_query_north_bridge_space; */
+       strcpy(XGIhw_ext.szVBIOSVer, "0.84");
+
+       XGIhw_ext.pSR = vmalloc(sizeof(struct XGI_DSReg) * SR_BUFFER_SIZE);
+       if (XGIhw_ext.pSR == NULL) {
+               printk(KERN_ERR "XGIfb: Fatal error: Allocating SRReg space failed.\n");
+               return -ENODEV;
+       }
+       XGIhw_ext.pSR[0].jIdx = XGIhw_ext.pSR[0].jVal = 0xFF;
 
+       XGIhw_ext.pCR = vmalloc(sizeof(struct XGI_DSReg) * CR_BUFFER_SIZE);
+       if (XGIhw_ext.pCR == NULL) {
+               vfree(XGIhw_ext.pSR);
+               printk(KERN_ERR "XGIfb: Fatal error: Allocating CRReg space failed.\n");
+               return -ENODEV;
+       }
+       XGIhw_ext.pCR[0].jIdx = XGIhw_ext.pCR[0].jVal = 0xFF;
 
-    XGIhw_ext.pSR = vmalloc(sizeof(struct XGI_DSReg) * SR_BUFFER_SIZE);
-         if (XGIhw_ext.pSR == NULL)
-         {
-                   printk(KERN_ERR "XGIfb: Fatal error: Allocating SRReg space failed.\n");
-                   return -ENODEV;
-         }
-         XGIhw_ext.pSR[0].jIdx = XGIhw_ext.pSR[0].jVal = 0xFF;
+       if (!XGIvga_enabled) {
+               /* Mapping Max FB Size for 315 Init */
+               XGIhw_ext.pjVideoMemoryAddress = ioremap(xgi_video_info.video_base, 0x10000000);
+               if ((xgifb_mode_idx < 0) || ((XGIbios_mode[xgifb_mode_idx].mode_no) != 0xFF)) {
+#ifdef LINUXBIOS
+                       printk("XGIfb: XGIInit() ...");
+                       /* XGIInitNewt for LINUXBIOS only */
+                       if (XGIInitNew(&XGIhw_ext))
+                               printk("OK\n");
+                       else
+                               printk("Fail\n");
+#endif
 
-         XGIhw_ext.pCR = vmalloc(sizeof(struct XGI_DSReg) * CR_BUFFER_SIZE);
-         if (XGIhw_ext.pCR == NULL)
-         {
-             vfree(XGIhw_ext.pSR);
-                   printk(KERN_ERR "XGIfb: Fatal error: Allocating CRReg space failed.\n");
-                   return -ENODEV;
-         }
-         XGIhw_ext.pCR[0].jIdx = XGIhw_ext.pCR[0].jVal = 0xFF;
+                       outXGIIDXREG(XGISR, IND_XGI_PASSWORD, XGI_PASSWORD);
 
+               }
+       }
+#ifdef LINUXBIOS
+       else {
+               XGIhw_ext.pjVideoMemoryAddress = ioremap(xgi_video_info.video_base, 0x10000000);
+               if ((xgifb_mode_idx < 0) || ((XGIbios_mode[xgifb_mode_idx].mode_no) != 0xFF)) {
 
+                       outXGIIDXREG(XGISR, IND_XGI_PASSWORD, XGI_PASSWORD);
 
+                       /* yilin Because no VBIOS DRAM Sizing, Dram size will error. */
+                       /* Set SR13 ,14 temporarily for UDtech */
+                       outXGIIDXREG(XGISR, 0x13, 0x45);
+                       outXGIIDXREG(XGISR, 0x14, 0x51);
 
-       if (!XGIvga_enabled)
-       {
-                       /* Mapping Max FB Size for 315 Init */
-           XGIhw_ext.pjVideoMemoryAddress = ioremap(xgi_video_info.video_base, 0x10000000);
-           if((xgifb_mode_idx < 0) || ((XGIbios_mode[xgifb_mode_idx].mode_no) != 0xFF))
-           {
-#ifdef LINUXBIOS
-               printk("XGIfb: XGIInit() ...");
-               /* XGIInitNewt for LINUXBIOS only */
-               if(XGIInitNew(&XGIhw_ext))
-               {
-                       printk("OK\n");
-               }
-               else
-               {
-                   printk("Fail\n");
                }
+       }
 #endif
+       if (XGIfb_get_dram_size()) {
+               vfree(XGIhw_ext.pSR);
+               vfree(XGIhw_ext.pCR);
+               printk(KERN_INFO "XGIfb: Fatal error: Unable to determine RAM size.\n");
+               return -ENODEV;
+       }
 
-               outXGIIDXREG(XGISR, IND_XGI_PASSWORD, XGI_PASSWORD);
+       if ((xgifb_mode_idx < 0) || ((XGIbios_mode[xgifb_mode_idx].mode_no) != 0xFF)) {
+               /* Enable PCI_LINEAR_ADDRESSING and MMIO_ENABLE  */
+               orXGIIDXREG(XGISR, IND_XGI_PCI_ADDRESS_SET, (XGI_PCI_ADDR_ENABLE | XGI_MEM_MAP_IO_ENABLE));
+               /* Enable 2D accelerator engine */
+               orXGIIDXREG(XGISR, IND_XGI_MODULE_ENABLE, XGI_ENABLE_2D);
+       }
 
+       XGIhw_ext.ulVideoMemorySize = xgi_video_info.video_size;
 
-           }
+       if (!request_mem_region(xgi_video_info.video_base, xgi_video_info.video_size, "XGIfb FB")) {
+               printk("unable request memory size %x", xgi_video_info.video_size);
+               printk(KERN_ERR "XGIfb: Fatal error: Unable to reserve frame buffer memory\n");
+               printk(KERN_ERR "XGIfb: Is there another framebuffer driver active?\n");
+               vfree(XGIhw_ext.pSR);
+               vfree(XGIhw_ext.pCR);
+               return -ENODEV;
        }
-#ifdef LINUXBIOS
-       else
-       {
-           XGIhw_ext.pjVideoMemoryAddress = ioremap(xgi_video_info.video_base, 0x10000000);
-           if((xgifb_mode_idx < 0) || ((XGIbios_mode[xgifb_mode_idx].mode_no) != 0xFF))
-           {
 
-               outXGIIDXREG(XGISR, IND_XGI_PASSWORD, XGI_PASSWORD);
+       if (!request_mem_region(xgi_video_info.mmio_base, XGIfb_mmio_size, "XGIfb MMIO")) {
+               printk(KERN_ERR "XGIfb: Fatal error: Unable to reserve MMIO region\n");
+               release_mem_region(xgi_video_info.video_base, xgi_video_info.video_size);
+               vfree(XGIhw_ext.pSR);
+               vfree(XGIhw_ext.pCR);
+               return -ENODEV;
+       }
 
-               // yilin Because no VBIOS DRAM Sizing, Dram size will error.
-               // Set SR13 ,14 temporarily for UDtech
-               outXGIIDXREG(XGISR, 0x13, 0x45);
-               outXGIIDXREG(XGISR, 0x14, 0x51);
+       xgi_video_info.video_vbase = XGIhw_ext.pjVideoMemoryAddress =
+       ioremap(xgi_video_info.video_base, xgi_video_info.video_size);
+       xgi_video_info.mmio_vbase = ioremap(xgi_video_info.mmio_base, XGIfb_mmio_size);
 
+       printk(KERN_INFO "XGIfb: Framebuffer at 0x%lx, mapped to 0x%p, size %dk\n",
+                       xgi_video_info.video_base, xgi_video_info.video_vbase, xgi_video_info.video_size / 1024);
 
-           }
-       }
-#endif
-       if (XGIfb_get_dram_size())
-       {
-           vfree(XGIhw_ext.pSR);
-           vfree(XGIhw_ext.pCR);
-           printk(KERN_INFO "XGIfb: Fatal error: Unable to determine RAM size.\n");
-           return -ENODEV;
-       }
-
-
-
-         if((xgifb_mode_idx < 0) || ((XGIbios_mode[xgifb_mode_idx].mode_no) != 0xFF))
-         {
-              /* Enable PCI_LINEAR_ADDRESSING and MMIO_ENABLE  */
-        orXGIIDXREG(XGISR, IND_XGI_PCI_ADDRESS_SET, (XGI_PCI_ADDR_ENABLE | XGI_MEM_MAP_IO_ENABLE));
-         /* Enable 2D accelerator engine */
-        orXGIIDXREG(XGISR, IND_XGI_MODULE_ENABLE, XGI_ENABLE_2D);
-    }
-
-         XGIhw_ext.ulVideoMemorySize = xgi_video_info.video_size;
-
-         if (!request_mem_region(xgi_video_info.video_base, xgi_video_info.video_size, "XGIfb FB"))
-         {         printk("unable request memory size %x",xgi_video_info.video_size);
-                   printk(KERN_ERR "XGIfb: Fatal error: Unable to reserve frame buffer memory\n");
-                   printk(KERN_ERR "XGIfb: Is there another framebuffer driver active?\n");
-                   vfree(XGIhw_ext.pSR);
-                   vfree(XGIhw_ext.pCR);
-                   return -ENODEV;
-         }
-
-         if (!request_mem_region(xgi_video_info.mmio_base, XGIfb_mmio_size, "XGIfb MMIO"))
-         {
-                   printk(KERN_ERR "XGIfb: Fatal error: Unable to reserve MMIO region\n");
-                   release_mem_region(xgi_video_info.video_base, xgi_video_info.video_size);
-                   vfree(XGIhw_ext.pSR);
-                   vfree(XGIhw_ext.pCR);
-                   return -ENODEV;
-         }
-
-         xgi_video_info.video_vbase = XGIhw_ext.pjVideoMemoryAddress =
-               ioremap(xgi_video_info.video_base, xgi_video_info.video_size);
-         xgi_video_info.mmio_vbase = ioremap(xgi_video_info.mmio_base, XGIfb_mmio_size);
-
-         printk(KERN_INFO "XGIfb: Framebuffer at 0x%lx, mapped to 0x%p, size %dk\n",
-             xgi_video_info.video_base, xgi_video_info.video_vbase,xgi_video_info.video_size / 1024);
-
-         printk(KERN_INFO "XGIfb: MMIO at 0x%lx, mapped to 0x%p, size %ldk\n",
-             xgi_video_info.mmio_base, xgi_video_info.mmio_vbase,XGIfb_mmio_size / 1024);
-          printk("XGIfb: XGIInitNew() ...");
-         if(XGIInitNew(&XGIhw_ext))
-         {
-                 printk("OK\n");
-         }
-         else
-         {
+       printk(KERN_INFO "XGIfb: MMIO at 0x%lx, mapped to 0x%p, size %ldk\n",
+                       xgi_video_info.mmio_base, xgi_video_info.mmio_vbase, XGIfb_mmio_size / 1024);
+       printk("XGIfb: XGIInitNew() ...");
+       if (XGIInitNew(&XGIhw_ext))
+               printk("OK\n");
+       else
                printk("Fail\n");
-         }
-
-         if(XGIfb_heap_init())
-         {
-                   printk(KERN_WARNING "XGIfb: Failed to initialize offscreen memory heap\n");
-         }
-
-
-         xgi_video_info.mtrr = (unsigned int) 0;
-
-         if((xgifb_mode_idx < 0) || ((XGIbios_mode[xgifb_mode_idx].mode_no) != 0xFF))
-         {
-                 xgi_video_info.hasVB = HASVB_NONE;
-        if((xgi_video_info.chip == XG20)||(xgi_video_info.chip == XG27))
-             xgi_video_info.hasVB = HASVB_NONE;
-        else if(xgi_video_info.chip == XG21) {
-            inXGIIDXREG(XGICR,0x38,CR38);
-            if ((CR38&0xE0) == 0xC0) {
-                   xgi_video_info.disp_state = DISPTYPE_LCD;
-                   if (!XGIfb_GetXG21LVDSData()) {
-                           int m;
-                           for (m = 0; m < sizeof(XGI21_LCDCapList)/sizeof(struct XGI21_LVDSCapStruct); m++) {
-                                   if ((XGI21_LCDCapList[m].LVDSHDE == XGIbios_mode[xgifb_mode_idx].xres) &&
-                                       (XGI21_LCDCapList[m].LVDSVDE == XGIbios_mode[xgifb_mode_idx].yres)) {
-                                               XGINew_SetReg1( XGI_Pr.P3d4 , 0x36, m) ;
-                                   }
-                           }
-                   }
-            }
-            else if ((CR38&0xE0) == 0x60)
-               xgi_video_info.hasVB = HASVB_CHRONTEL ;
-            else
+
+       if (XGIfb_heap_init())
+               printk(KERN_WARNING "XGIfb: Failed to initialize offscreen memory heap\n");
+
+       xgi_video_info.mtrr = (unsigned int) 0;
+
+       if ((xgifb_mode_idx < 0) || ((XGIbios_mode[xgifb_mode_idx].mode_no) != 0xFF)) {
                xgi_video_info.hasVB = HASVB_NONE;
-       }
-        else
-                   XGIfb_get_VB_type();
+               if ((xgi_video_info.chip == XG20) || (xgi_video_info.chip == XG27)) {
+                       xgi_video_info.hasVB = HASVB_NONE;
+               } else if (xgi_video_info.chip == XG21) {
+                       inXGIIDXREG(XGICR, 0x38, CR38);
+                       if ((CR38&0xE0) == 0xC0) {
+                               xgi_video_info.disp_state = DISPTYPE_LCD;
+                               if (!XGIfb_GetXG21LVDSData()) {
+                                       int m;
+                                       for (m = 0; m < sizeof(XGI21_LCDCapList)/sizeof(struct XGI21_LVDSCapStruct); m++) {
+                                               if ((XGI21_LCDCapList[m].LVDSHDE == XGIbios_mode[xgifb_mode_idx].xres) &&
+                                                               (XGI21_LCDCapList[m].LVDSVDE == XGIbios_mode[xgifb_mode_idx].yres)) {
+                                                       XGINew_SetReg1(XGI_Pr.P3d4, 0x36, m);
+                                               }
+                                       }
+                               }
+                       } else if ((CR38&0xE0) == 0x60) {
+                               xgi_video_info.hasVB = HASVB_CHRONTEL;
+                       } else {
+                               xgi_video_info.hasVB = HASVB_NONE;
+                       }
+               } else {
+                       XGIfb_get_VB_type();
+               }
 
-                   XGIhw_ext.ujVBChipID = VB_CHIP_UNKNOWN;
+               XGIhw_ext.ujVBChipID = VB_CHIP_UNKNOWN;
 
-                   XGIhw_ext.ulExternalChip = 0;
+               XGIhw_ext.ulExternalChip = 0;
 
                switch (xgi_video_info.hasVB) {
                case HASVB_301:
-                       inXGIIDXREG(XGIPART4, 0x01, reg);
+                       inXGIIDXREG(XGIPART4, 0x01, reg);
                        if (reg >= 0xE0) {
                                XGIhw_ext.ujVBChipID = VB_CHIP_302LV;
-                               printk(KERN_INFO "XGIfb: XGI302LV bridge detected (revision 0x%02x)\n",reg);
-                       } else if (reg >= 0xD0) {
+                               printk(KERN_INFO "XGIfb: XGI302LV bridge detected (revision 0x%02x)\n", reg);
+                       } else if (reg >= 0xD0) {
                                XGIhw_ext.ujVBChipID = VB_CHIP_301LV;
-                               printk(KERN_INFO "XGIfb: XGI301LV bridge detected (revision 0x%02x)\n",reg);
-                       }
+                               printk(KERN_INFO "XGIfb: XGI301LV bridge detected (revision 0x%02x)\n", reg);
+                       }
                        /* else if (reg >= 0xB0) {
                                XGIhw_ext.ujVBChipID = VB_CHIP_301B;
-                               inXGIIDXREG(XGIPART4,0x23,reg1);
-                              printk("XGIfb: XGI301B bridge detected\n");
-                       }*/
+                               inXGIIDXREG(XGIPART4, 0x23, reg1);
+                               printk("XGIfb: XGI301B bridge detected\n");
+                       } */
                        else {
                                XGIhw_ext.ujVBChipID = VB_CHIP_301;
                                printk("XGIfb: XGI301 bridge detected\n");
                        }
                        break;
                case HASVB_302:
-                       inXGIIDXREG(XGIPART4, 0x01, reg);
+                       inXGIIDXREG(XGIPART4, 0x01, reg);
                        if (reg >= 0xE0) {
                                XGIhw_ext.ujVBChipID = VB_CHIP_302LV;
-                               printk(KERN_INFO "XGIfb: XGI302LV bridge detected (revision 0x%02x)\n",reg);
-                       } else if (reg >= 0xD0) {
+                               printk(KERN_INFO "XGIfb: XGI302LV bridge detected (revision 0x%02x)\n", reg);
+                       } else if (reg >= 0xD0) {
                                XGIhw_ext.ujVBChipID = VB_CHIP_301LV;
-                               printk(KERN_INFO "XGIfb: XGI302LV bridge detected (revision 0x%02x)\n",reg);
-                       } else if (reg >= 0xB0) {
-                               inXGIIDXREG(XGIPART4,0x23,reg1);
+                               printk(KERN_INFO "XGIfb: XGI302LV bridge detected (revision 0x%02x)\n", reg);
+                       } else if (reg >= 0xB0) {
+                               inXGIIDXREG(XGIPART4, 0x23, reg1);
 
-                               XGIhw_ext.ujVBChipID = VB_CHIP_302B;
+                               XGIhw_ext.ujVBChipID = VB_CHIP_302B;
 
                        } else {
-                               XGIhw_ext.ujVBChipID = VB_CHIP_302;
+                               XGIhw_ext.ujVBChipID = VB_CHIP_302;
                                printk(KERN_INFO "XGIfb: XGI302 bridge detected\n");
                        }
                        break;
@@ -3212,14 +3234,13 @@ static int __devinit xgifb_probe(struct pci_dev *pdev,
                        XGIhw_ext.ulExternalChip = 0x5;
                        printk(KERN_INFO "XGIfb: LVDS transmitter and Chrontel TV encoder detected\n");
                        break;
-               default:
+               default:
                        printk(KERN_INFO "XGIfb: No or unknown bridge type detected\n");
                        break;
                }
 
-               if (xgi_video_info.hasVB != HASVB_NONE) {
-                   XGIfb_detect_VB();
-    }
+               if (xgi_video_info.hasVB != HASVB_NONE)
+                       XGIfb_detect_VB();
 
                if (xgi_video_info.disp_state & DISPTYPE_DISP2) {
                        if (XGIfb_crt1off)
@@ -3231,61 +3252,52 @@ static int __devinit xgifb_probe(struct pci_dev *pdev,
                }
 
                if (xgi_video_info.disp_state & DISPTYPE_LCD) {
-                   if (!enable_dstn) {
-                       inXGIIDXREG(XGICR, IND_XGI_LCD_PANEL, reg);
-                           reg &= 0x0f;
-                           XGIhw_ext.ulCRT2LCDType = XGI310paneltype[reg];
-
-                   } else {
-                       // TW: FSTN/DSTN
-                       XGIhw_ext.ulCRT2LCDType = LCD_320x480;
-                   }
+                       if (!enable_dstn) {
+                               inXGIIDXREG(XGICR, IND_XGI_LCD_PANEL, reg);
+                               reg &= 0x0f;
+                               XGIhw_ext.ulCRT2LCDType = XGI310paneltype[reg];
+
+                       } else {
+                               /* TW: FSTN/DSTN */
+                               XGIhw_ext.ulCRT2LCDType = LCD_320x480;
+                       }
                }
 
                XGIfb_detectedpdc = 0;
 
-               XGIfb_detectedlcda = 0xff;
+               XGIfb_detectedlcda = 0xff;
 #ifndef LINUXBIOS
 
-                /* TW: Try to find about LCDA */
-
-        if((XGIhw_ext.ujVBChipID == VB_CHIP_302B) ||
-              (XGIhw_ext.ujVBChipID == VB_CHIP_301LV) ||
-              (XGIhw_ext.ujVBChipID == VB_CHIP_302LV))
-           {
-              int tmp;
-              inXGIIDXREG(XGICR,0x34,tmp);
-              if(tmp <= 0x13)
-              {
-                 // Currently on LCDA? (Some BIOSes leave CR38)
-                 inXGIIDXREG(XGICR,0x38,tmp);
-                     if((tmp & 0x03) == 0x03)
-                     {
-/*                       XGI_Pr.XGI_UseLCDA = 1; */
-                     }else
-                     {
-                    //  Currently on LCDA? (Some newer BIOSes set D0 in CR35)
-                        inXGIIDXREG(XGICR,0x35,tmp);
-                        if(tmp & 0x01)
-                        {
-/*                           XGI_Pr.XGI_UseLCDA = 1; */
-                          }else
-                          {
-                              inXGIIDXREG(XGICR,0x30,tmp);
-                              if(tmp & 0x20)
-                              {
-                                  inXGIIDXREG(XGIPART1,0x13,tmp);
-                                      if(tmp & 0x04)
-                                      {
-/*                                     XGI_Pr.XGI_UseLCDA = 1; */
-                                      }
-                              }
-                          }
-                       }
-                }
-
-        }
+               /* TW: Try to find about LCDA */
+
+               if ((XGIhw_ext.ujVBChipID == VB_CHIP_302B) ||
+                               (XGIhw_ext.ujVBChipID == VB_CHIP_301LV) ||
+                               (XGIhw_ext.ujVBChipID == VB_CHIP_302LV)) {
+                       int tmp;
+                       inXGIIDXREG(XGICR, 0x34, tmp);
+                       if (tmp <= 0x13) {
+                               /* Currently on LCDA? (Some BIOSes leave CR38) */
+                               inXGIIDXREG(XGICR, 0x38, tmp);
+                               if ((tmp & 0x03) == 0x03) {
+                                       /* XGI_Pr.XGI_UseLCDA = 1; */
+                               } else {
+                                       /* Currently on LCDA? (Some newer BIOSes set D0 in CR35) */
+                                       inXGIIDXREG(XGICR, 0x35, tmp);
+                                       if (tmp & 0x01) {
+                                               /* XGI_Pr.XGI_UseLCDA = 1; */
+                                       } else {
+                                               inXGIIDXREG(XGICR, 0x30, tmp);
+                                               if (tmp & 0x20) {
+                                                       inXGIIDXREG(XGIPART1, 0x13, tmp);
+                                                       if (tmp & 0x04) {
+                                                               /* XGI_Pr.XGI_UseLCDA = 1; */
+                                                       }
+                                               }
+                                       }
+                               }
+                       }
 
+               }
 
 #endif
 
@@ -3294,17 +3306,15 @@ static int __devinit xgifb_probe(struct pci_dev *pdev,
 
                if (xgifb_mode_idx < 0) {
                        switch (xgi_video_info.disp_state & DISPTYPE_DISP2) {
-                          case DISPTYPE_LCD:
+                       case DISPTYPE_LCD:
                                xgifb_mode_idx = DEFAULT_LCDMODE;
                                if (xgi_video_info.chip == XG21)
-                               {
-                                   xgifb_mode_idx = XGIfb_GetXG21DefaultLVDSModeIdx();
-                               }
+                                       xgifb_mode_idx = XGIfb_GetXG21DefaultLVDSModeIdx();
                                break;
-                          case DISPTYPE_TV:
+                       case DISPTYPE_TV:
                                xgifb_mode_idx = DEFAULT_TVMODE;
                                break;
-                          default:
+                       default:
                                xgifb_mode_idx = DEFAULT_MODE;
                                break;
                        }
@@ -3312,47 +3322,43 @@ static int __devinit xgifb_probe(struct pci_dev *pdev,
 
                XGIfb_mode_no = XGIbios_mode[xgifb_mode_idx].mode_no;
 
-
-                if( xgi_video_info.refresh_rate == 0)
-                   xgi_video_info.refresh_rate = 60; /*yilin set default refresh rate */
-               if(XGIfb_search_refresh_rate(xgi_video_info.refresh_rate) == 0)
-                {
-                   XGIfb_rate_idx = XGIbios_mode[xgifb_mode_idx].rate_idx;
-                   xgi_video_info.refresh_rate = 60;
-               }
+               if (xgi_video_info.refresh_rate == 0)
+                       xgi_video_info.refresh_rate = 60; /* yilin set default refresh rate */
+               if (XGIfb_search_refresh_rate(xgi_video_info.refresh_rate) == 0) {
+                       XGIfb_rate_idx = XGIbios_mode[xgifb_mode_idx].rate_idx;
+                       xgi_video_info.refresh_rate = 60;
+               }
 
                xgi_video_info.video_bpp = XGIbios_mode[xgifb_mode_idx].bpp;
                xgi_video_info.video_vwidth = xgi_video_info.video_width = XGIbios_mode[xgifb_mode_idx].xres;
                xgi_video_info.video_vheight = xgi_video_info.video_height = XGIbios_mode[xgifb_mode_idx].yres;
                xgi_video_info.org_x = xgi_video_info.org_y = 0;
                xgi_video_info.video_linelength = xgi_video_info.video_width * (xgi_video_info.video_bpp >> 3);
-               switch(xgi_video_info.video_bpp) {
-               case 8:
-                       xgi_video_info.DstColor = 0x0000;
-                       xgi_video_info.XGI310_AccelDepth = 0x00000000;
+               switch (xgi_video_info.video_bpp) {
+               case 8:
+                       xgi_video_info.DstColor = 0x0000;
+                       xgi_video_info.XGI310_AccelDepth = 0x00000000;
                        xgi_video_info.video_cmap_len = 256;
-                       break;
-               case 16:
-                       xgi_video_info.DstColor = 0x8000;
-                       xgi_video_info.XGI310_AccelDepth = 0x00010000;
+                       break;
+               case 16:
+                       xgi_video_info.DstColor = 0x8000;
+                       xgi_video_info.XGI310_AccelDepth = 0x00010000;
                        xgi_video_info.video_cmap_len = 16;
-                       break;
-               case 32:
-                       xgi_video_info.DstColor = 0xC000;
-                       xgi_video_info.XGI310_AccelDepth = 0x00020000;
+                       break;
+               case 32:
+                       xgi_video_info.DstColor = 0xC000;
+                       xgi_video_info.XGI310_AccelDepth = 0x00020000;
                        xgi_video_info.video_cmap_len = 16;
-                       break;
+                       break;
                default:
                        xgi_video_info.video_cmap_len = 16;
-                       printk(KERN_INFO "XGIfb: Unsupported depth %d", xgi_video_info.video_bpp);
+                       printk(KERN_INFO "XGIfb: Unsupported depth %d", xgi_video_info.video_bpp);
                        break;
-               }
-
-
+               }
 
                printk(KERN_INFO "XGIfb: Default mode is %dx%dx%d (%dHz)\n",
-                       xgi_video_info.video_width, xgi_video_info.video_height, xgi_video_info.video_bpp,
-                       xgi_video_info.refresh_rate);
+                               xgi_video_info.video_width, xgi_video_info.video_height, xgi_video_info.video_bpp,
+                               xgi_video_info.refresh_rate);
 
                default_var.xres = default_var.xres_virtual = xgi_video_info.video_width;
                default_var.yres = default_var.yres_virtual = xgi_video_info.video_height;
@@ -3364,29 +3370,29 @@ static int __devinit xgifb_probe(struct pci_dev *pdev,
                                XGIfb_mode_rate_to_dclock(&XGI_Pr, &XGIhw_ext,
                                                XGIfb_mode_no, XGIfb_rate_idx));
 
-               if(XGIfb_mode_rate_to_ddata(&XGI_Pr, &XGIhw_ext,
-                        XGIfb_mode_no, XGIfb_rate_idx,
-                        &default_var.left_margin, &default_var.right_margin,
-                        &default_var.upper_margin, &default_var.lower_margin,
-                        &default_var.hsync_len, &default_var.vsync_len,
-                        &default_var.sync, &default_var.vmode)) {
-
-                  if((default_var.vmode & FB_VMODE_MASK) == FB_VMODE_INTERLACED) {
-                     default_var.yres <<= 1;
-                     default_var.yres_virtual <<= 1;
-                  } else if((default_var.vmode & FB_VMODE_MASK) == FB_VMODE_DOUBLE) {
-                     default_var.pixclock >>= 1;
-                     default_var.yres >>= 1;
-                     default_var.yres_virtual >>= 1;
-                  }
+               if (XGIfb_mode_rate_to_ddata(&XGI_Pr, &XGIhw_ext,
+                       XGIfb_mode_no, XGIfb_rate_idx,
+                       &default_var.left_margin, &default_var.right_margin,
+                       &default_var.upper_margin, &default_var.lower_margin,
+                       &default_var.hsync_len, &default_var.vsync_len,
+                       &default_var.sync, &default_var.vmode)) {
+
+                       if ((default_var.vmode & FB_VMODE_MASK) == FB_VMODE_INTERLACED) {
+                               default_var.yres <<= 1;
+                               default_var.yres_virtual <<= 1;
+                       } else if ((default_var.vmode & FB_VMODE_MASK) == FB_VMODE_DOUBLE) {
+                               default_var.pixclock >>= 1;
+                               default_var.yres >>= 1;
+                               default_var.yres_virtual >>= 1;
+                       }
 
-               }
+               }
 
                xgi_video_info.accel = 0;
-               if(XGIfb_accel) {
-                  xgi_video_info.accel = -1;
-                  default_var.accel_flags |= FB_ACCELF_TEXT;
-                  XGIfb_initaccel();
+               if (XGIfb_accel) {
+                       xgi_video_info.accel = -1;
+                       default_var.accel_flags |= FB_ACCELF_TEXT;
+                       XGIfb_initaccel();
                }
 
                fb_info->flags = FBINFO_FLAG_DEFAULT;
@@ -3400,33 +3406,28 @@ static int __devinit xgifb_probe(struct pci_dev *pdev,
 
                fb_alloc_cmap(&fb_info->cmap, 256 , 0);
 
-
 #ifdef CONFIG_MTRR
                xgi_video_info.mtrr = mtrr_add((unsigned int) xgi_video_info.video_base,
                                (unsigned int) xgi_video_info.video_size,
                                MTRR_TYPE_WRCOMB, 1);
-               if(xgi_video_info.mtrr) {
+               if (xgi_video_info.mtrr)
                        printk(KERN_INFO "XGIfb: Added MTRRs\n");
-               }
 #endif
 
-               if(register_framebuffer(fb_info) < 0)
-    {
+               if (register_framebuffer(fb_info) < 0)
                        return -EINVAL;
-    }
 
                XGIfb_registered = 1;
 
                printk(KERN_INFO "XGIfb: Installed XGIFB_GET_INFO ioctl (%lx)\n",
-                      XGIFB_GET_INFO);
+                               XGIFB_GET_INFO);
 
-/*             printk(KERN_INFO "XGIfb: 2D acceleration is %s, scrolling mode %s\n",
-                    XGIfb_accel ? "enabled" : "disabled",
-                    XGIfb_ypan  ? "ypan" : "redraw");
-*/
+               /*              printk(KERN_INFO "XGIfb: 2D acceleration is %s, scrolling mode %s\n",
+                XGIfb_accel ? "enabled" : "disabled",
+                XGIfb_ypan  ? "ypan" : "redraw");
+                */
                printk(KERN_INFO "fb%d: %s frame buffer device, Version %d.%d.%02d\n",
-                       fb_info->node, myid, VER_MAJOR, VER_MINOR, VER_LEVEL);
-
+                               fb_info->node, myid, VER_MAJOR, VER_MINOR, VER_LEVEL);
 
        }
 
@@ -3435,7 +3436,6 @@ static int __devinit xgifb_probe(struct pci_dev *pdev,
        return 0;
 }
 
-
 /*****************************************************/
 /*                PCI DEVICE HANDLING                */
 /*****************************************************/
@@ -3443,20 +3443,20 @@ static int __devinit xgifb_probe(struct pci_dev *pdev,
 static void __devexit xgifb_remove(struct pci_dev *pdev)
 {
        /* Unregister the framebuffer */
-//     if(xgi_video_info.registered) {
-               unregister_framebuffer(fb_info);
-               framebuffer_release(fb_info);
-//     }
+       /* if (xgi_video_info.registered) { */
+       unregister_framebuffer(fb_info);
+       framebuffer_release(fb_info);
+       /* } */
 
        pci_set_drvdata(pdev, NULL);
 
 };
 
 static struct pci_driver xgifb_driver = {
-       .name           = "xgifb",
-       .id_table       = xgifb_pci_table,
-       .probe          = xgifb_probe,
-       .remove         = __devexit_p(xgifb_remove)
+       .name = "xgifb",
+       .id_table = xgifb_pci_table,
+       .probe = xgifb_probe,
+       .remove = __devexit_p(xgifb_remove)
 };
 
 XGIINITSTATIC int __init xgifb_init(void)
@@ -3468,10 +3468,9 @@ XGIINITSTATIC int __init xgifb_init(void)
                return -ENODEV;
        XGIfb_setup(option);
 #endif
-       return(pci_register_driver(&xgifb_driver));
+       return pci_register_driver(&xgifb_driver);
 }
 
-
 #ifndef MODULE
 module_init(xgifb_init);
 #endif
@@ -3482,36 +3481,34 @@ module_init(xgifb_init);
 
 #ifdef MODULE
 
-static char         *mode = NULL;
-static int          vesa = 0;
+static char *mode = NULL;
+static int vesa = 0;
 static unsigned int rate = 0;
 static unsigned int mem = 0;
-static char         *forcecrt2type = NULL;
-static int          forcecrt1 = -1;
-static int          pdc = -1;
-static int          pdc1 = -1;
-static int          noaccel = -1;
-static int          noypan  = -1;
-static int         nomax = -1;
-static int          userom = -1;
-static int          useoem = -1;
-static char         *tvstandard = NULL;
-static int         nocrt2rate = 0;
-static int          scalelcd = -1;
-static char        *specialtiming = NULL;
-static int         lvdshl = -1;
-static int         tvxposoffset = 0, tvyposoffset = 0;
+static char *forcecrt2type = NULL;
+static int forcecrt1 = -1;
+static int pdc = -1;
+static int pdc1 = -1;
+static int noaccel = -1;
+static int noypan = -1;
+static int nomax = -1;
+static int userom = -1;
+static int useoem = -1;
+static char *tvstandard = NULL;
+static int nocrt2rate = 0;
+static int scalelcd = -1;
+static char *specialtiming = NULL;
+static int lvdshl = -1;
+static int tvxposoffset = 0, tvyposoffset = 0;
 #if !defined(__i386__) && !defined(__x86_64__)
-static int         resetcard = 0;
-static int         videoram = 0;
+static int resetcard = 0;
+static int videoram = 0;
 #endif
 
 MODULE_DESCRIPTION("Z7 Z9 Z9S Z11 framebuffer device driver");
 MODULE_LICENSE("GPL");
 MODULE_AUTHOR("XGITECH , Others");
 
-
-
 module_param(mem, int, 0);
 module_param(noaccel, int, 0);
 module_param(noypan, int, 0);
@@ -3538,122 +3535,115 @@ module_param(resetcard, int, 0);
 module_param(videoram, int, 0);
 #endif
 
-
 MODULE_PARM_DESC(mem,
-       "\nDetermines the beginning of the video memory heap in KB. This heap is used\n"
-         "for video RAM management for eg. DRM/DRI. On 300 series, the default depends\n"
-         "on the amount of video RAM available. If 8MB of video RAM or less is available,\n"
-         "the heap starts at 4096KB, if between 8 and 16MB are available at 8192KB,\n"
-         "otherwise at 12288KB. On 315 and Xabre series, the heap size is 32KB by default.\n"
-         "The value is to be specified without 'KB' and must match the MaxXFBMem setting\n"
-         "for XFree86 4.x/X.org 6.7 and later.\n");
+               "\nDetermines the beginning of the video memory heap in KB. This heap is used\n"
+               "for video RAM management for eg. DRM/DRI. On 300 series, the default depends\n"
+               "on the amount of video RAM available. If 8MB of video RAM or less is available,\n"
+               "the heap starts at 4096KB, if between 8 and 16MB are available at 8192KB,\n"
+               "otherwise at 12288KB. On 315 and Xabre series, the heap size is 32KB by default.\n"
+               "The value is to be specified without 'KB' and must match the MaxXFBMem setting\n"
+               "for XFree86 4.x/X.org 6.7 and later.\n");
 
 MODULE_PARM_DESC(noaccel,
-        "\nIf set to anything other than 0, 2D acceleration will be disabled.\n"
-         "(default: 0)\n");
+               "\nIf set to anything other than 0, 2D acceleration will be disabled.\n"
+               "(default: 0)\n");
 
 MODULE_PARM_DESC(noypan,
-        "\nIf set to anything other than 0, y-panning will be disabled and scrolling\n"
-         "will be performed by redrawing the screen. (default: 0)\n");
+               "\nIf set to anything other than 0, y-panning will be disabled and scrolling\n"
+               "will be performed by redrawing the screen. (default: 0)\n");
 
 MODULE_PARM_DESC(nomax,
-        "\nIf y-panning is enabled, xgifb will by default use the entire available video\n"
-         "memory for the virtual screen in order to optimize scrolling performance. If\n"
-         "this is set to anything other than 0, xgifb will not do this and thereby \n"
-         "enable the user to positively specify a virtual Y size of the screen using\n"
-         "fbset. (default: 0)\n");
-
-
+               "\nIf y-panning is enabled, xgifb will by default use the entire available video\n"
+               "memory for the virtual screen in order to optimize scrolling performance. If\n"
+               "this is set to anything other than 0, xgifb will not do this and thereby\n"
+               "enable the user to positively specify a virtual Y size of the screen using\n"
+               "fbset. (default: 0)\n");
 
 MODULE_PARM_DESC(mode,
-       "\nSelects the desired default display mode in the format XxYxDepth,\n"
-         "eg. 1024x768x16. Other formats supported include XxY-Depth and\n"
-        "XxY-Depth@Rate. If the parameter is only one (decimal or hexadecimal)\n"
-        "number, it will be interpreted as a VESA mode number. (default: 800x600x8)\n");
+               "\nSelects the desired default display mode in the format XxYxDepth,\n"
+               "eg. 1024x768x16. Other formats supported include XxY-Depth and\n"
+               "XxY-Depth@Rate. If the parameter is only one (decimal or hexadecimal)\n"
+               "number, it will be interpreted as a VESA mode number. (default: 800x600x8)\n");
 
 MODULE_PARM_DESC(vesa,
-       "\nSelects the desired default display mode by VESA defined mode number, eg.\n"
-         "0x117 (default: 0x0103)\n");
-
+               "\nSelects the desired default display mode by VESA defined mode number, eg.\n"
+               "0x117 (default: 0x0103)\n");
 
 MODULE_PARM_DESC(rate,
-       "\nSelects the desired vertical refresh rate for CRT1 (external VGA) in Hz.\n"
-         "If the mode is specified in the format XxY-Depth@Rate, this parameter\n"
-         "will be ignored (default: 60)\n");
+               "\nSelects the desired vertical refresh rate for CRT1 (external VGA) in Hz.\n"
+               "If the mode is specified in the format XxY-Depth@Rate, this parameter\n"
+               "will be ignored (default: 60)\n");
 
 MODULE_PARM_DESC(forcecrt1,
-       "\nNormally, the driver autodetects whether or not CRT1 (external VGA) is \n"
-         "connected. With this option, the detection can be overridden (1=CRT1 ON,\n"
-         "0=CRT1 OFF) (default: [autodetected])\n");
+               "\nNormally, the driver autodetects whether or not CRT1 (external VGA) is\n"
+               "connected. With this option, the detection can be overridden (1=CRT1 ON,\n"
+               "0=CRT1 OFF) (default: [autodetected])\n");
 
 MODULE_PARM_DESC(forcecrt2type,
-       "\nIf this option is omitted, the driver autodetects CRT2 output devices, such as\n"
-         "LCD, TV or secondary VGA. With this option, this autodetection can be\n"
-         "overridden. Possible parameters are LCD, TV, VGA or NONE. NONE disables CRT2.\n"
-         "On systems with a SiS video bridge, parameters SVIDEO, COMPOSITE or SCART can\n"
-         "be used instead of TV to override the TV detection. Furthermore, on systems\n"
-         "with a SiS video bridge, SVIDEO+COMPOSITE, HIVISION, YPBPR480I, YPBPR480P,\n"
-         "YPBPR720P and YPBPR1080I are understood. However, whether or not these work\n"
-         "depends on the very hardware in use. (default: [autodetected])\n");
+               "\nIf this option is omitted, the driver autodetects CRT2 output devices, such as\n"
+               "LCD, TV or secondary VGA. With this option, this autodetection can be\n"
+               "overridden. Possible parameters are LCD, TV, VGA or NONE. NONE disables CRT2.\n"
+               "On systems with a SiS video bridge, parameters SVIDEO, COMPOSITE or SCART can\n"
+               "be used instead of TV to override the TV detection. Furthermore, on systems\n"
+               "with a SiS video bridge, SVIDEO+COMPOSITE, HIVISION, YPBPR480I, YPBPR480P,\n"
+               "YPBPR720P and YPBPR1080I are understood. However, whether or not these work\n"
+               "depends on the very hardware in use. (default: [autodetected])\n");
 
 MODULE_PARM_DESC(scalelcd,
-       "\nSetting this to 1 will force the driver to scale the LCD image to the panel's\n"
-         "native resolution. Setting it to 0 will disable scaling; LVDS panels will\n"
-         "show black bars around the image, TMDS panels will probably do the scaling\n"
-         "themselves. Default: 1 on LVDS panels, 0 on TMDS panels\n");
+               "\nSetting this to 1 will force the driver to scale the LCD image to the panel's\n"
+               "native resolution. Setting it to 0 will disable scaling; LVDS panels will\n"
+               "show black bars around the image, TMDS panels will probably do the scaling\n"
+               "themselves. Default: 1 on LVDS panels, 0 on TMDS panels\n");
 
 MODULE_PARM_DESC(pdc,
-        "\nThis is for manually selecting the LCD panel delay compensation. The driver\n"
-         "should detect this correctly in most cases; however, sometimes this is not\n"
-         "possible. If you see 'small waves' on the LCD, try setting this to 4, 32 or 24\n"
-         "on a 300 series chipset; 6 on a 315 series chipset. If the problem persists,\n"
-         "try other values (on 300 series: between 4 and 60 in steps of 4; on 315 series:\n"
-         "any value from 0 to 31). (default: autodetected, if LCD is active during start)\n");
+               "\nThis is for manually selecting the LCD panel delay compensation. The driver\n"
+               "should detect this correctly in most cases; however, sometimes this is not\n"
+               "possible. If you see 'small waves' on the LCD, try setting this to 4, 32 or 24\n"
+               "on a 300 series chipset; 6 on a 315 series chipset. If the problem persists,\n"
+               "try other values (on 300 series: between 4 and 60 in steps of 4; on 315 series:\n"
+               "any value from 0 to 31). (default: autodetected, if LCD is active during start)\n");
 
 MODULE_PARM_DESC(pdc1,
-        "\nThis is same as pdc, but for LCD-via CRT1. Hence, this is for the 315/330\n"
-         "series only. (default: autodetected if LCD is in LCD-via-CRT1 mode during\n"
-         "startup) - Note: currently, this has no effect because LCD-via-CRT1 is not\n"
-         "implemented yet.\n");
+               "\nThis is same as pdc, but for LCD-via CRT1. Hence, this is for the 315/330\n"
+               "series only. (default: autodetected if LCD is in LCD-via-CRT1 mode during\n"
+               "startup) - Note: currently, this has no effect because LCD-via-CRT1 is not\n"
+               "implemented yet.\n");
 
 MODULE_PARM_DESC(specialtiming,
-       "\nPlease refer to documentation for more information on this option.\n");
+               "\nPlease refer to documentation for more information on this option.\n");
 
 MODULE_PARM_DESC(lvdshl,
-       "\nPlease refer to documentation for more information on this option.\n");
+               "\nPlease refer to documentation for more information on this option.\n");
 
 MODULE_PARM_DESC(tvstandard,
-       "\nThis allows overriding the BIOS default for the TV standard. Valid choices are\n"
-         "pal, ntsc, palm and paln. (default: [auto; pal or ntsc only])\n");
+               "\nThis allows overriding the BIOS default for the TV standard. Valid choices are\n"
+               "pal, ntsc, palm and paln. (default: [auto; pal or ntsc only])\n");
 
 MODULE_PARM_DESC(tvxposoffset,
-       "\nRelocate TV output horizontally. Possible parameters: -32 through 32.\n"
-         "Default: 0\n");
+               "\nRelocate TV output horizontally. Possible parameters: -32 through 32.\n"
+               "Default: 0\n");
 
 MODULE_PARM_DESC(tvyposoffset,
-       "\nRelocate TV output vertically. Possible parameters: -32 through 32.\n"
-         "Default: 0\n");
+               "\nRelocate TV output vertically. Possible parameters: -32 through 32.\n"
+               "Default: 0\n");
 
 MODULE_PARM_DESC(filter,
-       "\nSelects TV flicker filter type (only for systems with a SiS301 video bridge).\n"
-         "(Possible values 0-7, default: [no filter])\n");
+               "\nSelects TV flicker filter type (only for systems with a SiS301 video bridge).\n"
+               "(Possible values 0-7, default: [no filter])\n");
 
 MODULE_PARM_DESC(nocrt2rate,
-       "\nSetting this to 1 will force the driver to use the default refresh rate for\n"
-         "CRT2 if CRT2 type is VGA. (default: 0, use same rate as CRT1)\n");
-
-
-
+               "\nSetting this to 1 will force the driver to use the default refresh rate for\n"
+               "CRT2 if CRT2 type is VGA. (default: 0, use same rate as CRT1)\n");
 
 static int __init xgifb_init_module(void)
 {
-        printk("\nXGIfb_init_module");
-       if(mode)
+       printk("\nXGIfb_init_module");
+       if (mode)
                XGIfb_search_mode(mode);
        else if (vesa != -1)
                XGIfb_search_vesamode(vesa);
 
-        return(xgifb_init());
+       return xgifb_init();
 }
 
 static void __exit xgifb_remove_module(void)
@@ -3665,7 +3655,7 @@ static void __exit xgifb_remove_module(void)
 module_init(xgifb_init_module);
 module_exit(xgifb_remove_module);
 
-#endif            /*  /MODULE  */
+#endif /*  /MODULE  */
 
 EXPORT_SYMBOL(XGI_malloc);
 EXPORT_SYMBOL(XGI_free);