]> Pileus Git - ~andy/linux/blobdiff - drivers/staging/xgifb/vb_table.h
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wirel...
[~andy/linux] / drivers / staging / xgifb / vb_table.h
index e7946f1c11430a9222ff50d729378af936c27f0b..e8d6f674b274f745da615283ca9ef119c34dcf69 100644 (file)
@@ -1,5 +1,5 @@
 /* yilin modify for xgi20 */
-static struct XGI_MCLKDataStruct XGI340New_MCLKData[] = {
+static struct SiS_MCLKData XGI340New_MCLKData[] = {
        {0x16, 0x01, 0x01, 166},
        {0x19, 0x02, 0x01, 124},
        {0x7C, 0x08, 0x01, 200},
@@ -10,7 +10,7 @@ static struct XGI_MCLKDataStruct XGI340New_MCLKData[] = {
        {0x5c, 0x23, 0x01, 166}
 };
 
-static struct XGI_MCLKDataStruct XGI27New_MCLKData[] = {
+static struct SiS_MCLKData XGI27New_MCLKData[] = {
        {0x5c, 0x23, 0x01, 166},
        {0x19, 0x02, 0x01, 124},
        {0x7C, 0x08, 0x80, 200},
@@ -33,6 +33,13 @@ static struct XGI_ECLKDataStruct XGI340_ECLKData[] = {
        {0x5c, 0x23, 0x01, 166}
 };
 
+static unsigned char XG27_SR13[4][8] = {
+       {0x35, 0x45, 0xb1, 0x00, 0x00, 0x00, 0x00, 0x00}, /* SR13 */
+       {0x41, 0x51, 0x5c, 0x00, 0x00, 0x00, 0x00, 0x00}, /* SR14 */
+       {0x32, 0x32, 0x42, 0x00, 0x00, 0x00, 0x00, 0x00}, /* SR18 */
+       {0x03, 0x03, 0x03, 0x00, 0x00, 0x00, 0x00, 0x00}  /* SR1B */
+};
+
 static unsigned char XGI340_SR13[4][8] = {
        {0x35, 0x45, 0xb1, 0x00, 0x00, 0x00, 0x00, 0x00}, /* SR13 */
        {0x41, 0x51, 0x5c, 0x00, 0x00, 0x00, 0x00, 0x00}, /* SR14 */
@@ -71,7 +78,7 @@ static unsigned char XGI27_cr41[24][8] = {
        {0x20, 0x40, 0x60, 0x00, 0x00, 0x00, 0x00, 0x00}, /* 0 CR41 */
        {0xC4, 0x40, 0x84, 0x00, 0x00, 0x00, 0x00, 0x00}, /* 1 CR8A */
        {0xC4, 0x40, 0x84, 0x00, 0x00, 0x00, 0x00, 0x00}, /* 2 CR8B */
-       {0xB5, 0x13, 0xa4, 0x00, 0x00, 0x00, 0x00, 0x00}, /* 3 CR40[7],
+       {0xB3, 0x13, 0xa4, 0x00, 0x00, 0x00, 0x00, 0x00}, /* 3 CR40[7],
                                                               CR99[2:0],
                                                               CR45[3:0]*/
        {0xf0, 0xf5, 0xf0, 0x00, 0x00, 0x00, 0x00, 0x00}, /* 4 CR59 */
@@ -296,7 +303,7 @@ static struct XGI_ExtStruct XGI330_EModeIDTable[] = {
                0x00, 0x00, 0x00, 0x00, 0x00}
 };
 
-static struct XGI_StandTableStruct XGI330_StandTable[] = {
+static struct SiS_StandTable_S XGI330_StandTable[] = {
 /* MD_0_200 */
        {
                0x28, 0x18, 0x08, 0x0800,
@@ -2353,109 +2360,109 @@ static struct XGI_LVDSCRT1VDataStruct XGI_LVDSCRT11280x1024_2_Vx75[] = {
 
 /*add for new UNIVGABIOS*/
 static struct XGI330_LCDDataTablStruct XGI_LCDDataTable[] = {
-       {Panel1024x768, 0x0019, 0x0001, 0}, /* XGI_ExtLCD1024x768Data */
-       {Panel1024x768, 0x0019, 0x0000, 1}, /* XGI_StLCD1024x768Data */
-       {Panel1024x768, 0x0018, 0x0010, 2}, /* XGI_CetLCD1024x768Data */
-       {Panel1280x1024, 0x0019, 0x0001, 3}, /* XGI_ExtLCD1280x1024Data */
-       {Panel1280x1024, 0x0019, 0x0000, 4}, /* XGI_StLCD1280x1024Data */
-       {Panel1280x1024, 0x0018, 0x0010, 5}, /* XGI_CetLCD1280x1024Data */
-       {Panel1400x1050, 0x0019, 0x0001, 6}, /* XGI_ExtLCD1400x1050Data */
-       {Panel1400x1050, 0x0019, 0x0000, 7}, /* XGI_StLCD1400x1050Data */
-       {Panel1400x1050, 0x0018, 0x0010, 8}, /* XGI_CetLCD1400x1050Data */
-       {Panel1600x1200, 0x0019, 0x0001, 9}, /* XGI_ExtLCD1600x1200Data */
-       {Panel1600x1200, 0x0019, 0x0000, 10}, /* XGI_StLCD1600x1200Data */
+       {Panel_1024x768, 0x0019, 0x0001, 0}, /* XGI_ExtLCD1024x768Data */
+       {Panel_1024x768, 0x0019, 0x0000, 1}, /* XGI_StLCD1024x768Data */
+       {Panel_1024x768, 0x0018, 0x0010, 2}, /* XGI_CetLCD1024x768Data */
+       {Panel_1280x1024, 0x0019, 0x0001, 3}, /* XGI_ExtLCD1280x1024Data */
+       {Panel_1280x1024, 0x0019, 0x0000, 4}, /* XGI_StLCD1280x1024Data */
+       {Panel_1280x1024, 0x0018, 0x0010, 5}, /* XGI_CetLCD1280x1024Data */
+       {Panel_1400x1050, 0x0019, 0x0001, 6}, /* XGI_ExtLCD1400x1050Data */
+       {Panel_1400x1050, 0x0019, 0x0000, 7}, /* XGI_StLCD1400x1050Data */
+       {Panel_1400x1050, 0x0018, 0x0010, 8}, /* XGI_CetLCD1400x1050Data */
+       {Panel_1600x1200, 0x0019, 0x0001, 9}, /* XGI_ExtLCD1600x1200Data */
+       {Panel_1600x1200, 0x0019, 0x0000, 10}, /* XGI_StLCD1600x1200Data */
        {PanelRef60Hz, 0x0008, 0x0008, 11}, /* XGI_NoScalingData */
-       {Panel1024x768x75, 0x0019, 0x0001, 12}, /* XGI_ExtLCD1024x768x75Data */
-       {Panel1024x768x75, 0x0019, 0x0000, 13}, /* XGI_StLCD1024x768x75Data */
-       {Panel1024x768x75, 0x0018, 0x0010, 14}, /* XGI_CetLCD1024x768x75Data */
-       {Panel1280x1024x75, 0x0019, 0x0001, 15}, /* XGI_ExtLCD1280x1024x75Data*/
-       {Panel1280x1024x75, 0x0019, 0x0000, 16}, /* XGI_StLCD1280x1024x75Data */
-       {Panel1280x1024x75, 0x0018, 0x0010, 17}, /* XGI_CetLCD1280x1024x75Data*/
+       {Panel_1024x768x75, 0x0019, 0x0001, 12}, /* XGI_ExtLCD1024x768x75Data */
+       {Panel_1024x768x75, 0x0019, 0x0000, 13}, /* XGI_StLCD1024x768x75Data */
+       {Panel_1024x768x75, 0x0018, 0x0010, 14}, /* XGI_CetLCD1024x768x75Data */
+       {Panel_1280x1024x75, 0x0019, 0x0001, 15}, /* XGI_ExtLCD1280x1024x75Data*/
+       {Panel_1280x1024x75, 0x0019, 0x0000, 16}, /* XGI_StLCD1280x1024x75Data */
+       {Panel_1280x1024x75, 0x0018, 0x0010, 17}, /* XGI_CetLCD1280x1024x75Data*/
        {PanelRef75Hz, 0x0008, 0x0008, 18}, /* XGI_NoScalingDatax75 */
        {0xFF, 0x0000, 0x0000, 0} /* End of table */
 };
 
 static struct XGI330_LCDDataTablStruct XGI_LCDDesDataTable[] = {
-       {Panel1024x768, 0x0019, 0x0001, 0}, /* XGI_ExtLCDDes1024x768Data */
-       {Panel1024x768, 0x0019, 0x0000, 1}, /* XGI_StLCDDes1024x768Data */
-       {Panel1024x768, 0x0018, 0x0010, 2}, /* XGI_CetLCDDes1024x768Data */
-       {Panel1280x1024, 0x0019, 0x0001, 3}, /* XGI_ExtLCDDes1280x1024Data */
-       {Panel1280x1024, 0x0019, 0x0000, 4}, /* XGI_StLCDDes1280x1024Data */
-       {Panel1280x1024, 0x0018, 0x0010, 5}, /* XGI_CetLCDDes1280x1024Data */
-       {Panel1400x1050, 0x0019, 0x0001, 6}, /* XGI_ExtLCDDes1400x1050Data */
-       {Panel1400x1050, 0x0019, 0x0000, 7}, /* XGI_StLCDDes1400x1050Data */
-       {Panel1400x1050, 0x0418, 0x0010, 8}, /* XGI_CetLCDDes1400x1050Data */
-       {Panel1400x1050, 0x0418, 0x0410, 9}, /* XGI_CetLCDDes1400x1050Data2 */
-       {Panel1600x1200, 0x0019, 0x0001, 10}, /* XGI_ExtLCDDes1600x1200Data */
-       {Panel1600x1200, 0x0019, 0x0000, 11}, /* XGI_StLCDDes1600x1200Data */
+       {Panel_1024x768, 0x0019, 0x0001, 0}, /* XGI_ExtLCDDes1024x768Data */
+       {Panel_1024x768, 0x0019, 0x0000, 1}, /* XGI_StLCDDes1024x768Data */
+       {Panel_1024x768, 0x0018, 0x0010, 2}, /* XGI_CetLCDDes1024x768Data */
+       {Panel_1280x1024, 0x0019, 0x0001, 3}, /* XGI_ExtLCDDes1280x1024Data */
+       {Panel_1280x1024, 0x0019, 0x0000, 4}, /* XGI_StLCDDes1280x1024Data */
+       {Panel_1280x1024, 0x0018, 0x0010, 5}, /* XGI_CetLCDDes1280x1024Data */
+       {Panel_1400x1050, 0x0019, 0x0001, 6}, /* XGI_ExtLCDDes1400x1050Data */
+       {Panel_1400x1050, 0x0019, 0x0000, 7}, /* XGI_StLCDDes1400x1050Data */
+       {Panel_1400x1050, 0x0418, 0x0010, 8}, /* XGI_CetLCDDes1400x1050Data */
+       {Panel_1400x1050, 0x0418, 0x0410, 9}, /* XGI_CetLCDDes1400x1050Data2 */
+       {Panel_1600x1200, 0x0019, 0x0001, 10}, /* XGI_ExtLCDDes1600x1200Data */
+       {Panel_1600x1200, 0x0019, 0x0000, 11}, /* XGI_StLCDDes1600x1200Data */
        {PanelRef60Hz, 0x0008, 0x0008, 12}, /* XGI_NoScalingDesData */
-       {Panel1024x768x75, 0x0019, 0x0001, 13}, /*XGI_ExtLCDDes1024x768x75Data*/
-       {Panel1024x768x75, 0x0019, 0x0000, 14}, /* XGI_StLCDDes1024x768x75Data*/
-       {Panel1024x768x75, 0x0018, 0x0010, 15}, /*XGI_CetLCDDes1024x768x75Data*/
+       {Panel_1024x768x75, 0x0019, 0x0001, 13}, /*XGI_ExtLCDDes1024x768x75Data*/
+       {Panel_1024x768x75, 0x0019, 0x0000, 14}, /* XGI_StLCDDes1024x768x75Data*/
+       {Panel_1024x768x75, 0x0018, 0x0010, 15}, /*XGI_CetLCDDes1024x768x75Data*/
        /* XGI_ExtLCDDes1280x1024x75Data */
-       {Panel1280x1024x75, 0x0019, 0x0001, 16},
+       {Panel_1280x1024x75, 0x0019, 0x0001, 16},
        /* XGI_StLCDDes1280x1024x75Data */
-       {Panel1280x1024x75, 0x0019, 0x0000, 17},
+       {Panel_1280x1024x75, 0x0019, 0x0000, 17},
        /* XGI_CetLCDDes1280x1024x75Data */
-       {Panel1280x1024x75, 0x0018, 0x0010, 18},
+       {Panel_1280x1024x75, 0x0018, 0x0010, 18},
        {PanelRef75Hz, 0x0008, 0x0008, 19}, /* XGI_NoScalingDesDatax75 */
        {0xFF, 0x0000, 0x0000, 0}
 };
 
 static struct XGI330_LCDDataTablStruct xgifb_epllcd_crt1[] = {
-       {Panel1024x768, 0x0018, 0x0000, 0}, /* XGI_LVDSCRT11024x768_1 */
-       {Panel1024x768, 0x0018, 0x0010, 1}, /* XGI_LVDSCRT11024x768_2 */
-       {Panel1280x1024, 0x0018, 0x0000, 2}, /* XGI_LVDSCRT11280x1024_1 */
-       {Panel1280x1024, 0x0018, 0x0010, 3}, /* XGI_LVDSCRT11280x1024_2 */
-       {Panel1400x1050, 0x0018, 0x0000, 4}, /* XGI_LVDSCRT11400x1050_1 */
-       {Panel1400x1050, 0x0018, 0x0010, 5}, /* XGI_LVDSCRT11400x1050_2 */
-       {Panel1600x1200, 0x0018, 0x0000, 6}, /* XGI_LVDSCRT11600x1200_1 */
-       {Panel1024x768x75, 0x0018, 0x0000, 7}, /* XGI_LVDSCRT11024x768_1x75 */
-       {Panel1024x768x75, 0x0018, 0x0010, 8}, /* XGI_LVDSCRT11024x768_2x75 */
-       {Panel1280x1024x75, 0x0018, 0x0000, 9}, /*XGI_LVDSCRT11280x1024_1x75*/
-       {Panel1280x1024x75, 0x0018, 0x0010, 10},/*XGI_LVDSCRT11280x1024_2x75*/
+       {Panel_1024x768, 0x0018, 0x0000, 0}, /* XGI_LVDSCRT11024x768_1 */
+       {Panel_1024x768, 0x0018, 0x0010, 1}, /* XGI_LVDSCRT11024x768_2 */
+       {Panel_1280x1024, 0x0018, 0x0000, 2}, /* XGI_LVDSCRT11280x1024_1 */
+       {Panel_1280x1024, 0x0018, 0x0010, 3}, /* XGI_LVDSCRT11280x1024_2 */
+       {Panel_1400x1050, 0x0018, 0x0000, 4}, /* XGI_LVDSCRT11400x1050_1 */
+       {Panel_1400x1050, 0x0018, 0x0010, 5}, /* XGI_LVDSCRT11400x1050_2 */
+       {Panel_1600x1200, 0x0018, 0x0000, 6}, /* XGI_LVDSCRT11600x1200_1 */
+       {Panel_1024x768x75, 0x0018, 0x0000, 7}, /* XGI_LVDSCRT11024x768_1x75 */
+       {Panel_1024x768x75, 0x0018, 0x0010, 8}, /* XGI_LVDSCRT11024x768_2x75 */
+       {Panel_1280x1024x75, 0x0018, 0x0000, 9}, /*XGI_LVDSCRT11280x1024_1x75*/
+       {Panel_1280x1024x75, 0x0018, 0x0010, 10},/*XGI_LVDSCRT11280x1024_2x75*/
        {0xFF, 0x0000, 0x0000, 0}
 };
 
 static struct XGI330_LCDDataTablStruct XGI_EPLLCDDataPtr[] = {
-       {Panel1024x768, 0x0018, 0x0000, 0}, /* XGI_LVDS1024x768Data_1 */
-       {Panel1024x768, 0x0018, 0x0010, 1}, /* XGI_LVDS1024x768Data_2 */
-       {Panel1280x1024, 0x0018, 0x0000, 2}, /* XGI_LVDS1280x1024Data_1 */
-       {Panel1280x1024, 0x0018, 0x0010, 3}, /* XGI_LVDS1280x1024Data_2 */
-       {Panel1400x1050, 0x0018, 0x0000, 4}, /* XGI_LVDS1400x1050Data_1 */
-       {Panel1400x1050, 0x0018, 0x0010, 5}, /* XGI_LVDS1400x1050Data_2 */
-       {Panel1600x1200, 0x0018, 0x0000, 6}, /* XGI_LVDS1600x1200Data_1 */
+       {Panel_1024x768, 0x0018, 0x0000, 0}, /* XGI_LVDS1024x768Data_1 */
+       {Panel_1024x768, 0x0018, 0x0010, 1}, /* XGI_LVDS1024x768Data_2 */
+       {Panel_1280x1024, 0x0018, 0x0000, 2}, /* XGI_LVDS1280x1024Data_1 */
+       {Panel_1280x1024, 0x0018, 0x0010, 3}, /* XGI_LVDS1280x1024Data_2 */
+       {Panel_1400x1050, 0x0018, 0x0000, 4}, /* XGI_LVDS1400x1050Data_1 */
+       {Panel_1400x1050, 0x0018, 0x0010, 5}, /* XGI_LVDS1400x1050Data_2 */
+       {Panel_1600x1200, 0x0018, 0x0000, 6}, /* XGI_LVDS1600x1200Data_1 */
        {PanelRef60Hz, 0x0008, 0x0008, 7}, /* XGI_LVDSNoScalingData */
-       {Panel1024x768x75, 0x0018, 0x0000, 8}, /* XGI_LVDS1024x768Data_1x75 */
-       {Panel1024x768x75, 0x0018, 0x0010, 9}, /* XGI_LVDS1024x768Data_2x75 */
-       {Panel1280x1024x75, 0x0018, 0x0000, 10}, /* XGI_LVDS1280x1024Data_1x75*/
-       {Panel1280x1024x75, 0x0018, 0x0010, 11},  /*XGI_LVDS1280x1024Data_2x75*/
+       {Panel_1024x768x75, 0x0018, 0x0000, 8}, /* XGI_LVDS1024x768Data_1x75 */
+       {Panel_1024x768x75, 0x0018, 0x0010, 9}, /* XGI_LVDS1024x768Data_2x75 */
+       {Panel_1280x1024x75, 0x0018, 0x0000, 10}, /* XGI_LVDS1280x1024Data_1x75*/
+       {Panel_1280x1024x75, 0x0018, 0x0010, 11},  /*XGI_LVDS1280x1024Data_2x75*/
        {PanelRef75Hz, 0x0008, 0x0008, 12}, /* XGI_LVDSNoScalingDatax75 */
        {0xFF, 0x0000, 0x0000, 0}
 };
 
 static struct XGI330_LCDDataTablStruct XGI_EPLLCDDesDataPtr[] = {
-       {Panel1024x768, 0x0018, 0x0000, 0}, /* XGI_LVDS1024x768Des_1 */
-       {Panel1024x768, 0x0618, 0x0410, 1}, /* XGI_LVDS1024x768Des_3 */
-       {Panel1024x768, 0x0018, 0x0010, 2}, /* XGI_LVDS1024x768Des_2 */
-       {Panel1280x1024, 0x0018, 0x0000, 3}, /* XGI_LVDS1280x1024Des_1 */
-       {Panel1280x1024, 0x0018, 0x0010, 4}, /* XGI_LVDS1280x1024Des_2 */
-       {Panel1400x1050, 0x0018, 0x0000, 5}, /* XGI_LVDS1400x1050Des_1 */
-       {Panel1400x1050, 0x0018, 0x0010, 6}, /* XGI_LVDS1400x1050Des_2 */
-       {Panel1600x1200, 0x0018, 0x0000, 7}, /* XGI_LVDS1600x1200Des_1 */
+       {Panel_1024x768, 0x0018, 0x0000, 0}, /* XGI_LVDS1024x768Des_1 */
+       {Panel_1024x768, 0x0618, 0x0410, 1}, /* XGI_LVDS1024x768Des_3 */
+       {Panel_1024x768, 0x0018, 0x0010, 2}, /* XGI_LVDS1024x768Des_2 */
+       {Panel_1280x1024, 0x0018, 0x0000, 3}, /* XGI_LVDS1280x1024Des_1 */
+       {Panel_1280x1024, 0x0018, 0x0010, 4}, /* XGI_LVDS1280x1024Des_2 */
+       {Panel_1400x1050, 0x0018, 0x0000, 5}, /* XGI_LVDS1400x1050Des_1 */
+       {Panel_1400x1050, 0x0018, 0x0010, 6}, /* XGI_LVDS1400x1050Des_2 */
+       {Panel_1600x1200, 0x0018, 0x0000, 7}, /* XGI_LVDS1600x1200Des_1 */
        {PanelRef60Hz, 0x0008, 0x0008, 8},  /* XGI_LVDSNoScalingDesData */
-       {Panel1024x768x75, 0x0018, 0x0000, 9}, /* XGI_LVDS1024x768Des_1x75 */
-       {Panel1024x768x75, 0x0618, 0x0410, 10}, /* XGI_LVDS1024x768Des_3x75 */
-       {Panel1024x768x75, 0x0018, 0x0010, 11}, /* XGI_LVDS1024x768Des_2x75 */
-       {Panel1280x1024x75, 0x0018, 0x0000, 12}, /* XGI_LVDS1280x1024Des_1x75 */
-       {Panel1280x1024x75, 0x0018, 0x0010, 13}, /* XGI_LVDS1280x1024Des_2x75 */
+       {Panel_1024x768x75, 0x0018, 0x0000, 9}, /* XGI_LVDS1024x768Des_1x75 */
+       {Panel_1024x768x75, 0x0618, 0x0410, 10}, /* XGI_LVDS1024x768Des_3x75 */
+       {Panel_1024x768x75, 0x0018, 0x0010, 11}, /* XGI_LVDS1024x768Des_2x75 */
+       {Panel_1280x1024x75, 0x0018, 0x0000, 12}, /* XGI_LVDS1280x1024Des_1x75 */
+       {Panel_1280x1024x75, 0x0018, 0x0010, 13}, /* XGI_LVDS1280x1024Des_2x75 */
        {PanelRef75Hz, 0x0008, 0x0008, 14}, /* XGI_LVDSNoScalingDesDatax75 */
        {0xFF, 0x0000, 0x0000, 0}
 };
 
 static struct XGI330_LCDDataTablStruct XGI_EPLCHLCDRegPtr[] = {
-       {Panel1024x768, 0x0000, 0x0000, 0}, /* XGI_CH7017LV1024x768 */
-       {Panel1400x1050, 0x0000, 0x0000, 1}, /* XGI_CH7017LV1400x1050 */
+       {Panel_1024x768, 0x0000, 0x0000, 0}, /* XGI_CH7017LV1024x768 */
+       {Panel_1400x1050, 0x0000, 0x0000, 1}, /* XGI_CH7017LV1400x1050 */
        {0xFF, 0x0000, 0x0000, 0}
 };
 
@@ -2501,225 +2508,225 @@ static unsigned short LCDLenList[] = {
 /* Dual link only */
 static struct XGI330_LCDCapStruct  XGI_LCDDLCapList[] = {
 /* LCDCap1024x768 */
-       {Panel1024x768, DefaultLCDCap, 0, 0x012, 0x88, 0x06, VCLK65,
+       {Panel_1024x768, DefaultLCDCap, 0, 0x012, 0x88, 0x06, VCLK65_315,
        0x6C, 0xC3, 0x35, 0x62, 0x02, 0x14, 0x0A, 0x02, 0x00,
        0x30, 0x10, 0x5A, 0x10, 0x10, 0x0A, 0xC0, 0x28, 0x10},
 /* LCDCap1280x1024 */
-       {Panel1280x1024, LCDDualLink+DefaultLCDCap, StLCDBToA,
-       0x012, 0x70, 0x03, VCLK108_2,
+       {Panel_1280x1024, XGI_LCDDualLink+DefaultLCDCap, StLCDBToA,
+       0x012, 0x70, 0x03, VCLK108_2_315,
        0x70, 0x44, 0xF8, 0x2F, 0x02, 0x14, 0x0A, 0x02, 0x00,
        0x30, 0x10, 0x5A, 0x10, 0x10, 0x0A, 0xC0, 0x30, 0x10},
 /* LCDCap1400x1050 */
-       {Panel1400x1050, LCDDualLink+DefaultLCDCap, StLCDBToA,
-       0x012, 0x70, 0x03, VCLK108_2,
+       {Panel_1400x1050, XGI_LCDDualLink+DefaultLCDCap, StLCDBToA,
+       0x012, 0x70, 0x03, VCLK108_2_315,
         0x70, 0x44, 0xF8, 0x2F, 0x02, 0x14, 0x0A, 0x02, 0x00,
         0x30, 0x10, 0x5A, 0x10, 0x10, 0x0A, 0xC0, 0x30, 0x10},
 /* LCDCap1600x1200 */
-       {Panel1600x1200, LCDDualLink+DefaultLCDCap, LCDToFull,
+       {Panel_1600x1200, XGI_LCDDualLink+DefaultLCDCap, LCDToFull,
        0x012, 0xC0, 0x03, VCLK162,
         0x43, 0x22, 0x70, 0x24, 0x02, 0x14, 0x0A, 0x02, 0x00,
         0x30, 0x10, 0x5A, 0x10, 0x10, 0x0A, 0xC0, 0x30, 0x10},
 /* LCDCap1024x768x75 */
-       {Panel1024x768x75, DefaultLCDCap, 0, 0x012, 0x60, 0, VCLK78_75,
+       {Panel_1024x768x75, DefaultLCDCap, 0, 0x012, 0x60, 0, VCLK78_75,
         0x2B, 0x61, 0x2B, 0x61, 0x02, 0x14, 0x0A, 0x02, 0x00,
         0x30, 0x10, 0x5A, 0x10, 0x10, 0x0A, 0xC0, 0x28, 0x10},
 /* LCDCap1280x1024x75 */
-       {Panel1280x1024x75, LCDDualLink+DefaultLCDCap, StLCDBToA,
+       {Panel_1280x1024x75, XGI_LCDDualLink+DefaultLCDCap, StLCDBToA,
        0x012, 0x90, 0x03, VCLK135_5,
         0x54, 0x42, 0x4A, 0x61, 0x02, 0x14, 0x0A, 0x02, 0x00,
         0x30, 0x10, 0x5A, 0x10, 0x10, 0x0A, 0xC0, 0x30, 0x10},
 /* LCDCapDefault */
-       {0xFF, DefaultLCDCap, 0, 0x012, 0x88, 0x06, VCLK65,
+       {0xFF, DefaultLCDCap, 0, 0x012, 0x88, 0x06, VCLK65_315,
        0x6C, 0xC3, 0x35, 0x62, 0x02, 0x14, 0x0A, 0x02, 0x00,
        0x30, 0x10, 0x5A, 0x10, 0x10, 0x0A, 0xC0, 0x28, 0x10}
 };
 
 static struct XGI330_LCDCapStruct  XGI_LCDCapList[] = {
 /* LCDCap1024x768 */
-       {Panel1024x768, DefaultLCDCap, 0, 0x012, 0x88, 0x06, VCLK65,
+       {Panel_1024x768, DefaultLCDCap, 0, 0x012, 0x88, 0x06, VCLK65_315,
        0x6C, 0xC3, 0x35, 0x62, 0x02, 0x14, 0x0A, 0x02, 0x00,
        0x30, 0x10, 0x5A, 0x10, 0x10, 0x0A, 0xC0, 0x28, 0x10},
 /* LCDCap1280x1024 */
-       {Panel1280x1024, DefaultLCDCap, StLCDBToA,
-       0x012, 0x70, 0x03, VCLK108_2,
+       {Panel_1280x1024, DefaultLCDCap, StLCDBToA,
+       0x012, 0x70, 0x03, VCLK108_2_315,
        0x70, 0x44, 0xF8, 0x2F, 0x02, 0x14, 0x0A, 0x02, 0x00,
        0x30, 0x10, 0x5A, 0x10, 0x10, 0x0A, 0xC0, 0x30, 0x10},
 /* LCDCap1400x1050 */
-       {Panel1400x1050, DefaultLCDCap, StLCDBToA,
-       0x012, 0x70, 0x03, VCLK108_2,
+       {Panel_1400x1050, DefaultLCDCap, StLCDBToA,
+       0x012, 0x70, 0x03, VCLK108_2_315,
         0x70, 0x44, 0xF8, 0x2F, 0x02, 0x14, 0x0A, 0x02, 0x00,
         0x30, 0x10, 0x5A, 0x10, 0x10, 0x0A, 0xC0, 0x30, 0x10},
 /* LCDCap1600x1200 */
-       {Panel1600x1200, DefaultLCDCap, LCDToFull,
+       {Panel_1600x1200, DefaultLCDCap, LCDToFull,
        0x012, 0xC0, 0x03, VCLK162,
         0x5A, 0x23, 0x5A, 0x23, 0x02, 0x14, 0x0A, 0x02, 0x00,
         0x30, 0x10, 0x5A, 0x10, 0x10, 0x0A, 0xC0, 0x30, 0x10},
 /* LCDCap1024x768x75 */
-       {Panel1024x768x75, DefaultLCDCap, 0, 0x012, 0x60, 0, VCLK78_75,
+       {Panel_1024x768x75, DefaultLCDCap, 0, 0x012, 0x60, 0, VCLK78_75,
         0x2B, 0x61, 0x2B, 0x61, 0x02, 0x14, 0x0A, 0x02, 0x00,
         0x30, 0x10, 0x5A, 0x10, 0x10, 0x0A, 0xC0, 0x28, 0x10},
 /* LCDCap1280x1024x75 */
-       {Panel1280x1024x75, DefaultLCDCap, StLCDBToA,
+       {Panel_1280x1024x75, DefaultLCDCap, StLCDBToA,
        0x012, 0x90, 0x03, VCLK135_5,
         0x54, 0x42, 0x4A, 0x61, 0x02, 0x14, 0x0A, 0x02, 0x00,
         0x30, 0x10, 0x5A, 0x10, 0x10, 0x0A, 0xC0, 0x30, 0x10},
 /* LCDCapDefault */
-       {0xFF, DefaultLCDCap, 0, 0x012, 0x88, 0x06, VCLK65,
+       {0xFF, DefaultLCDCap, 0, 0x012, 0x88, 0x06, VCLK65_315,
        0x6C, 0xC3, 0x35, 0x62, 0x02, 0x14, 0x0A, 0x02, 0x00,
        0x30, 0x10, 0x5A, 0x10, 0x10, 0x0A, 0xC0, 0x28, 0x10}
 };
 
 static struct XGI_Ext2Struct XGI330_RefIndex[] = {
-       {Support32Bpp + SupportAllCRT2 + SyncPN, RES320x200, VCLK25_175,
+       {Mode32Bpp + SupportAllCRT2 + SyncPN, RES320x200, VCLK25_175,
        0x00, 0x10, 0x59, 320, 200},/* 00 */
-       {Support32Bpp + SupportAllCRT2 + SyncPN, RES320x200, VCLK25_175,
+       {Mode32Bpp + SupportAllCRT2 + SyncPN, RES320x200, VCLK25_175,
        0x00, 0x10, 0x00, 320, 400},/* 01 */
-       {Support32Bpp + SupportAllCRT2 + SyncNN, RES320x240, VCLK25_175,
+       {Mode32Bpp + SupportAllCRT2 + SyncNN, RES320x240, VCLK25_175,
        0x04, 0x20, 0x50, 320, 240},/* 02 */
-       {Support32Bpp + SupportAllCRT2 + SyncPP, RES400x300, VCLK40,
+       {Mode32Bpp + SupportAllCRT2 + SyncPP, RES400x300, VCLK40,
        0x05, 0x32, 0x51, 400, 300},/* 03 */
-       {Support32Bpp + NoSupportTV + SyncNN + SupportTV1024, RES512x384,
-       VCLK65, 0x06, 0x43, 0x52, 512, 384},/* 04 */
-       {Support32Bpp + SupportAllCRT2 + SyncPN, RES640x400, VCLK25_175,
+       {Mode32Bpp + NoSupportTV + SyncNN + SupportTV1024, RES512x384,
+       VCLK65_315, 0x06, 0x43, 0x52, 512, 384},/* 04 */
+       {Mode32Bpp + SupportAllCRT2 + SyncPN, RES640x400, VCLK25_175,
        0x00, 0x14, 0x2f, 640, 400},/* 05 */
-       {Support32Bpp + SupportAllCRT2 + SyncNN, RES640x480x60, VCLK25_175,
+       {Mode32Bpp + SupportAllCRT2 + SyncNN, RES640x480x60, VCLK25_175,
        0x04, 0x24, 0x2e, 640, 480},/* 06 640x480x60Hz (LCD 640x480x60z) */
-       {Support32Bpp + NoSupportHiVisionTV + SyncNN, RES640x480x72, VCLK31_5,
+       {Mode32Bpp + NoSupportHiVisionTV + SyncNN, RES640x480x72, VCLK31_5,
        0x04, 0x24, 0x2e, 640, 480},/* 07 640x480x72Hz (LCD 640x480x70Hz) */
-       {Support32Bpp + NoSupportHiVisionTV + SyncNN, RES640x480x75, VCLK31_5,
+       {Mode32Bpp + NoSupportHiVisionTV + SyncNN, RES640x480x75, VCLK31_5,
        0x47, 0x24, 0x2e, 640, 480},/* 08 640x480x75Hz (LCD 640x480x75Hz) */
-       {Support32Bpp + SupportRAMDAC2 + SyncNN, RES640x480x85, VCLK36,
+       {Mode32Bpp + SupportRAMDAC2 + SyncNN, RES640x480x85, VCLK36,
        0x8A, 0x24, 0x2e, 640, 480},/* 09 640x480x85Hz */
-       {Support32Bpp + SupportRAMDAC2 + SyncPN, RES640x480x100, VCLK43_163,
+       {Mode32Bpp + SupportRAMDAC2 + SyncPN, RES640x480x100, VCLK43_163,
        0x00, 0x24, 0x2e, 640, 480},/* 0a 640x480x100Hz */
-       {Support32Bpp + SupportRAMDAC2 + SyncPN, RES640x480x120, VCLK52_406,
+       {Mode32Bpp + SupportRAMDAC2 + SyncPN, RES640x480x120, VCLK52_406,
        0x00, 0x24, 0x2e, 640, 480},/* 0b 640x480x120Hz */
-       {Support32Bpp + SupportRAMDAC2 + SyncPN, RES640x480x160, VCLK72_852,
+       {Mode32Bpp + SupportRAMDAC2 + SyncPN, RES640x480x160, VCLK72_852,
        0x00, 0x24, 0x2e, 640, 480},/* 0c 640x480x160Hz */
-       {Support32Bpp + SupportRAMDAC2 + SyncNN, RES640x480x200, VCLK86_6,
+       {Mode32Bpp + SupportRAMDAC2 + SyncNN, RES640x480x200, VCLK86_6,
        0x00, 0x24, 0x2e, 640, 480},/* 0d 640x480x200Hz */
-       {Support32Bpp + NoSupportLCD + SyncPP, RES800x600x56, VCLK36,
+       {Mode32Bpp + NoSupportLCD + SyncPP, RES800x600x56, VCLK36,
        0x05, 0x36, 0x6a, 800, 600},/* 0e 800x600x56Hz */
-       {Support32Bpp + NoSupportTV + SyncPP, RES800x600x60, VCLK40,
+       {Mode32Bpp + NoSupportTV + SyncPP, RES800x600x60, VCLK40,
        0x05, 0x36, 0x6a, 800, 600},/* 0f 800x600x60Hz (LCD 800x600x60Hz) */
-       {Support32Bpp + NoSupportHiVisionTV + SyncPP, RES800x600x72, VCLK50,
+       {Mode32Bpp + NoSupportHiVisionTV + SyncPP, RES800x600x72, VCLK50,
        0x48, 0x36, 0x6a, 800, 600},/* 10 800x600x72Hz (LCD 800x600x70Hz) */
-       {Support32Bpp + NoSupportHiVisionTV + SyncPP, RES800x600x75, VCLK49_5,
+       {Mode32Bpp + NoSupportHiVisionTV + SyncPP, RES800x600x75, VCLK49_5,
        0x8B, 0x36, 0x6a, 800, 600},/* 11 800x600x75Hz (LCD 800x600x75Hz) */
-       {Support32Bpp + SupportRAMDAC2 + SyncPP, RES800x600x85, VCLK56_25,
+       {Mode32Bpp + SupportRAMDAC2 + SyncPP, RES800x600x85, VCLK56_25,
        0x00, 0x36, 0x6a, 800, 600},/* 12 800x600x85Hz */
-       {Support32Bpp + SupportRAMDAC2 + SyncPN, RES800x600x100, VCLK68_179,
+       {Mode32Bpp + SupportRAMDAC2 + SyncPN, RES800x600x100, VCLK68_179,
        0x00, 0x36, 0x6a, 800, 600},/* 13 800x600x100Hz */
-       {Support32Bpp + SupportRAMDAC2 + SyncPN, RES800x600x120, VCLK83_95,
+       {Mode32Bpp + SupportRAMDAC2 + SyncPN, RES800x600x120, VCLK83_95,
        0x00, 0x36, 0x6a, 800, 600},/* 14 800x600x120Hz */
-       {Support32Bpp + SupportRAMDAC2 + SyncPN, RES800x600x160, VCLK116_406,
+       {Mode32Bpp + SupportRAMDAC2 + SyncPN, RES800x600x160, VCLK116_406,
        0x00, 0x36, 0x6a, 800, 600},/* 15 800x600x160Hz */
-       {Support32Bpp + InterlaceMode + SyncPP, RES1024x768x43, VCLK44_9,
+       {Mode32Bpp + InterlaceMode + SyncPP, RES1024x768x43, VCLK44_9,
        0x00, 0x47, 0x37, 1024, 768},/* 16 1024x768x43Hz */
        /* 17 1024x768x60Hz (LCD 1024x768x60Hz) */
-       {Support32Bpp + NoSupportTV + SyncNN + SupportTV1024, RES1024x768x60,
-       VCLK65, 0x06, 0x47, 0x37, 1024, 768},
-       {Support32Bpp + NoSupportHiVisionTV + SyncNN, RES1024x768x70, VCLK75,
+       {Mode32Bpp + NoSupportTV + SyncNN + SupportTV1024, RES1024x768x60,
+       VCLK65_315, 0x06, 0x47, 0x37, 1024, 768},
+       {Mode32Bpp + NoSupportHiVisionTV + SyncNN, RES1024x768x70, VCLK75,
        0x49, 0x47, 0x37, 1024, 768},/* 18 1024x768x70Hz (LCD 1024x768x70Hz) */
-       {Support32Bpp + NoSupportHiVisionTV + SyncPP, RES1024x768x75, VCLK78_75,
+       {Mode32Bpp + NoSupportHiVisionTV + SyncPP, RES1024x768x75, VCLK78_75,
        0x00, 0x47, 0x37, 1024, 768},/* 19 1024x768x75Hz (LCD 1024x768x75Hz) */
-       {Support32Bpp + SupportRAMDAC2 + SyncPP, RES1024x768x85, VCLK94_5,
+       {Mode32Bpp + SupportRAMDAC2 + SyncPP, RES1024x768x85, VCLK94_5,
        0x8C, 0x47, 0x37, 1024, 768},/* 1a 1024x768x85Hz */
-       {Support32Bpp + SupportRAMDAC2 + SyncPN, RES1024x768x100, VCLK113_309,
+       {Mode32Bpp + SupportRAMDAC2 + SyncPN, RES1024x768x100, VCLK113_309,
        0x00, 0x47, 0x37, 1024, 768},/* 1b 1024x768x100Hz */
-       {Support32Bpp + SupportRAMDAC2 + SyncPN, RES1024x768x120, VCLK139_054,
+       {Mode32Bpp + SupportRAMDAC2 + SyncPN, RES1024x768x120, VCLK139_054,
        0x00, 0x47, 0x37, 1024, 768},/* 1c 1024x768x120Hz */
-       {Support32Bpp + SupportLCD + SyncPP, RES1280x960x60, VCLK108_2,
+       {Mode32Bpp + SupportLCD + SyncPP, RES1280x960x60, VCLK108_2_315,
        0x08, 0x58, 0x7b, 1280, 960},/* 1d 1280x960x60Hz */
-       {Support32Bpp + InterlaceMode + SyncPP, RES1280x1024x43, VCLK78_75,
+       {Mode32Bpp + InterlaceMode + SyncPP, RES1280x1024x43, VCLK78_75,
        0x00, 0x58, 0x3a, 1280, 1024},/* 1e 1280x1024x43Hz */
-       {Support32Bpp + NoSupportTV + SyncPP, RES1280x1024x60, VCLK108_2,
+       {Mode32Bpp + NoSupportTV + SyncPP, RES1280x1024x60, VCLK108_2_315,
        0x07, 0x58, 0x3a, 1280, 1024},/*1f 1280x1024x60Hz (LCD 1280x1024x60Hz)*/
-       {Support32Bpp + NoSupportTV + SyncPP, RES1280x1024x75, VCLK135_5,
+       {Mode32Bpp + NoSupportTV + SyncPP, RES1280x1024x75, VCLK135_5,
        0x00, 0x58, 0x3a, 1280, 1024},/*20 1280x1024x75Hz (LCD 1280x1024x75Hz)*/
-       {Support32Bpp + SyncPP, RES1280x1024x85, VCLK157_5,
+       {Mode32Bpp + SyncPP, RES1280x1024x85, VCLK157_5,
        0x00, 0x58, 0x3a, 1280, 1024},/* 21 1280x1024x85Hz */
        /* 22 1600x1200x60Hz */
-       {Support32Bpp + SupportLCD + SyncPP + SupportCRT2in301C,
+       {Mode32Bpp + SupportLCD + SyncPP + SupportCRT2in301C,
        RES1600x1200x60, VCLK162, 0x09, 0x7A, 0x3c, 1600, 1200},
-       {Support32Bpp + SyncPP + SupportCRT2in301C, RES1600x1200x65, VCLK175,
+       {Mode32Bpp + SyncPP + SupportCRT2in301C, RES1600x1200x65, VCLK175,
        0x00, 0x69, 0x3c, 1600, 1200},/* 23 1600x1200x65Hz */
-       {Support32Bpp + SyncPP + SupportCRT2in301C, RES1600x1200x70, VCLK189,
+       {Mode32Bpp + SyncPP + SupportCRT2in301C, RES1600x1200x70, VCLK189,
        0x00, 0x69, 0x3c, 1600, 1200},/* 24 1600x1200x70Hz */
-       {Support32Bpp + SyncPP + SupportCRT2in301C, RES1600x1200x75, VCLK202_5,
+       {Mode32Bpp + SyncPP + SupportCRT2in301C, RES1600x1200x75, VCLK202_5,
        0x00, 0x69, 0x3c, 1600, 1200},/* 25 1600x1200x75Hz */
-       {Support32Bpp + SyncPP, RES1600x1200x85, VCLK229_5,
+       {Mode32Bpp + SyncPP, RES1600x1200x85, VCLK229_5,
        0x00, 0x69, 0x3c, 1600, 1200},/* 26 1600x1200x85Hz */
-       {Support32Bpp + SyncPP, RES1600x1200x100, VCLK269_655,
+       {Mode32Bpp + SyncPP, RES1600x1200x100, VCLK269_655,
        0x00, 0x69, 0x3c, 1600, 1200},/* 27 1600x1200x100Hz */
-       {Support32Bpp + SyncPP, RES1600x1200x120, VCLK323_586,
+       {Mode32Bpp + SyncPP, RES1600x1200x120, VCLK323_586,
        0x00, 0x69, 0x3c, 1600, 1200},/* 28 1600x1200x120Hz */
-       {Support32Bpp + SupportLCD + SyncNP, RES1920x1440x60, VCLK234,
+       {Mode32Bpp + SupportLCD + SyncNP, RES1920x1440x60, VCLK234,
        0x00, 0x00, 0x68, 1920, 1440},/* 29 1920x1440x60Hz */
-       {Support32Bpp + SyncPN, RES1920x1440x65, VCLK254_817,
+       {Mode32Bpp + SyncPN, RES1920x1440x65, VCLK254_817,
        0x00, 0x00, 0x68, 1920, 1440},/* 2a 1920x1440x65Hz */
-       {Support32Bpp + SyncPN, RES1920x1440x70, VCLK277_015,
+       {Mode32Bpp + SyncPN, RES1920x1440x70, VCLK277_015,
        0x00, 0x00, 0x68, 1920, 1440},/* 2b 1920x1440x70Hz */
-       {Support32Bpp + SyncPN, RES1920x1440x75, VCLK291_132,
+       {Mode32Bpp + SyncPN, RES1920x1440x75, VCLK291_132,
        0x00, 0x00, 0x68, 1920, 1440},/* 2c 1920x1440x75Hz */
-       {Support32Bpp + SyncPN, RES1920x1440x85, VCLK330_615,
+       {Mode32Bpp + SyncPN, RES1920x1440x85, VCLK330_615,
        0x00, 0x00, 0x68, 1920, 1440},/* 2d 1920x1440x85Hz */
-       {Support16Bpp + SyncPN, RES1920x1440x100, VCLK388_631,
+       {Mode16Bpp + SyncPN, RES1920x1440x100, VCLK388_631,
        0x00, 0x00, 0x68, 1920, 1440},/* 2e 1920x1440x100Hz */
-       {Support32Bpp + SupportLCD + SyncPN, RES2048x1536x60, VCLK266_952,
+       {Mode32Bpp + SupportLCD + SyncPN, RES2048x1536x60, VCLK266_952,
        0x00, 0x00, 0x6c, 2048, 1536},/* 2f 2048x1536x60Hz */
-       {Support32Bpp + SyncPN, RES2048x1536x65, VCLK291_766,
+       {Mode32Bpp + SyncPN, RES2048x1536x65, VCLK291_766,
        0x00, 0x00, 0x6c, 2048, 1536},/* 30 2048x1536x65Hz */
-       {Support32Bpp + SyncPN, RES2048x1536x70, VCLK315_195,
+       {Mode32Bpp + SyncPN, RES2048x1536x70, VCLK315_195,
        0x00, 0x00, 0x6c, 2048, 1536},/* 31 2048x1536x70Hz */
-       {Support32Bpp + SyncPN, RES2048x1536x75, VCLK340_477,
+       {Mode32Bpp + SyncPN, RES2048x1536x75, VCLK340_477,
        0x00, 0x00, 0x6c, 2048, 1536},/* 32 2048x1536x75Hz */
-       {Support16Bpp + SyncPN, RES2048x1536x85, VCLK375_847,
+       {Mode16Bpp + SyncPN, RES2048x1536x85, VCLK375_847,
        0x00, 0x00, 0x6c, 2048, 1536},/* 33 2048x1536x85Hz */
-       {Support32Bpp + SupportHiVisionTV + SupportRAMDAC2 +
-        SyncPP + SupportYPbPr, RES800x480x60, VCLK39_77,
+       {Mode32Bpp + SupportHiVision + SupportRAMDAC2 +
+        SyncPP + SupportYPbPr750p, RES800x480x60, VCLK39_77,
         0x08, 0x00, 0x70, 800, 480},/* 34 800x480x60Hz */
-       {Support32Bpp + SupportRAMDAC2 + SyncPP, RES800x480x75, VCLK49_5,
+       {Mode32Bpp + SupportRAMDAC2 + SyncPP, RES800x480x75, VCLK49_5,
        0x08, 0x00, 0x70, 800, 480},/* 35 800x480x75Hz */
-       {Support32Bpp + SupportRAMDAC2 + SyncPP, RES800x480x85, VCLK56_25,
+       {Mode32Bpp + SupportRAMDAC2 + SyncPP, RES800x480x85, VCLK56_25,
        0x08, 0x00, 0x70, 800, 480},/* 36 800x480x85Hz */
-       {Support32Bpp + SupportHiVisionTV + SupportRAMDAC2 +
-        SyncPP + SupportYPbPr, RES1024x576x60, VCLK65,
+       {Mode32Bpp + SupportHiVision + SupportRAMDAC2 +
+        SyncPP + SupportYPbPr750p, RES1024x576x60, VCLK65_315,
         0x09, 0x00, 0x71, 1024, 576},/* 37 1024x576x60Hz */
-       {Support32Bpp + SupportRAMDAC2 + SyncPP, RES1024x576x75, VCLK78_75,
+       {Mode32Bpp + SupportRAMDAC2 + SyncPP, RES1024x576x75, VCLK78_75,
        0x09, 0x00, 0x71, 1024, 576},/* 38 1024x576x75Hz */
-       {Support32Bpp + SupportRAMDAC2 + SyncPP, RES1024x576x85, VCLK94_5,
+       {Mode32Bpp + SupportRAMDAC2 + SyncPP, RES1024x576x85, VCLK94_5,
        0x09, 0x00, 0x71, 1024, 576},/* 39 1024x576x85Hz */
-       {Support32Bpp + SupportHiVisionTV + SupportRAMDAC2 +
-       SyncPP + SupportYPbPr, RES1280x720x60, VCLK108_2,
+       {Mode32Bpp + SupportHiVision + SupportRAMDAC2 +
+       SyncPP + SupportYPbPr750p, RES1280x720x60, VCLK108_2_315,
        0x0A, 0x00, 0x75, 1280, 720},/* 3a 1280x720x60Hz*/
-       {Support32Bpp + SupportRAMDAC2 + SyncPP, RES1280x720x75, VCLK135_5,
+       {Mode32Bpp + SupportRAMDAC2 + SyncPP, RES1280x720x75, VCLK135_5,
        0x0A, 0x00, 0x75, 1280, 720},/* 3b 1280x720x75Hz */
-       {Support32Bpp + SupportRAMDAC2 + SyncPP, RES1280x720x85, VCLK157_5,
+       {Mode32Bpp + SupportRAMDAC2 + SyncPP, RES1280x720x85, VCLK157_5,
        0x0A, 0x00, 0x75, 1280, 720},/* 3c 1280x720x85Hz */
-       {Support32Bpp + SupportTV + SyncNN, RES720x480x60, VCLK28_322,
+       {Mode32Bpp + SupportTV + SyncNN, RES720x480x60, VCLK28_322,
        0x06, 0x00, 0x31,  720, 480},/* 3d 720x480x60Hz */
-       {Support32Bpp + SupportTV + SyncPP, RES720x576x56, VCLK36,
+       {Mode32Bpp + SupportTV + SyncPP, RES720x576x56, VCLK36,
        0x06, 0x00, 0x32, 720, 576},/* 3e 720x576x56Hz */
-       {Support32Bpp + InterlaceMode + NoSupportLCD + SyncPP, RES856x480x79I,
+       {Mode32Bpp + InterlaceMode + NoSupportLCD + SyncPP, RES856x480x79I,
        VCLK35_2, 0x00, 0x00, 0x00,  856, 480},/* 3f 856x480x79I */
-       {Support32Bpp + NoSupportLCD + SyncNN, RES856x480x60, VCLK35_2,
+       {Mode32Bpp + NoSupportLCD + SyncNN, RES856x480x60, VCLK35_2,
        0x00, 0x00, 0x00,  856, 480},/* 40 856x480x60Hz */
-       {Support32Bpp + NoSupportHiVisionTV + SyncPP, RES1280x768x60,
+       {Mode32Bpp + NoSupportHiVisionTV + SyncPP, RES1280x768x60,
        VCLK79_411, 0x08, 0x48, 0x23, 1280, 768},/* 41 1280x768x60Hz */
-       {Support32Bpp + NoSupportHiVisionTV + SyncPP, RES1400x1050x60,
+       {Mode32Bpp + NoSupportHiVisionTV + SyncPP, RES1400x1050x60,
        VCLK122_61, 0x08, 0x69, 0x26, 1400, 1050},/* 42 1400x1050x60Hz */
-       {Support32Bpp + SupportRAMDAC2 + SyncPP, RES1152x864x60, VCLK80_350,
+       {Mode32Bpp + SupportRAMDAC2 + SyncPP, RES1152x864x60, VCLK80_350,
        0x37, 0x00, 0x20, 1152, 864},/* 43 1152x864x60Hz */
-       {Support32Bpp + SupportRAMDAC2 + SyncPP, RES1152x864x75, VCLK107_385,
+       {Mode32Bpp + SupportRAMDAC2 + SyncPP, RES1152x864x75, VCLK107_385,
        0x37, 0x00, 0x20, 1152, 864},/* 44 1152x864x75Hz */
-       {Support32Bpp + SupportLCD + SupportRAMDAC2 + SyncPP, RES1280x960x75,
+       {Mode32Bpp + SupportLCD + SupportRAMDAC2 + SyncPP, RES1280x960x75,
        VCLK125_999, 0x3A, 0x88, 0x7b, 1280, 960},/* 45 1280x960x75Hz */
-       {Support32Bpp + SupportLCD + SupportRAMDAC2 + SyncPP, RES1280x960x85,
+       {Mode32Bpp + SupportLCD + SupportRAMDAC2 + SyncPP, RES1280x960x85,
        VCLK148_5, 0x0A, 0x88, 0x7b, 1280, 960},/* 46 1280x960x85Hz */
-       {Support32Bpp + SupportLCD + SupportRAMDAC2 + SyncPP, RES1280x960x120,
+       {Mode32Bpp + SupportLCD + SupportRAMDAC2 + SyncPP, RES1280x960x120,
        VCLK217_325, 0x3A, 0x88, 0x7b, 1280, 960},/* 47 1280x960x120Hz */
-       {Support32Bpp + SupportRAMDAC2 + SyncPN, RES1024x768x160, VCLK139_054,
+       {Mode32Bpp + SupportRAMDAC2 + SyncPN, RES1024x768x160, VCLK139_054,
        0x30, 0x47, 0x37, 1024, 768},/* 48 1024x768x160Hz */
 };
 
@@ -2729,7 +2736,7 @@ static unsigned char XGI330_ScreenOffset[] = {
        0x57, 0x48
 };
 
-static struct XGI_StResInfoStruct XGI330_StResInfo[] = {
+static struct SiS_StResInfo_S XGI330_StResInfo[] = {
        {640, 400},
        {640, 350},
        {720, 400},
@@ -2737,7 +2744,7 @@ static struct XGI_StResInfoStruct XGI330_StResInfo[] = {
        {640, 480}
 };
 
-static struct XGI_ModeResInfoStruct XGI330_ModeResInfo[] = {
+static struct SiS_ModeResInfo_S XGI330_ModeResInfo[] = {
        { 320,  200, 8,  8},
        { 320,  240, 8,  8},
        { 320,  400, 8,  8},
@@ -2803,6 +2810,8 @@ static unsigned char XG27_CRDE[2];
 static unsigned char XG27_SR40 = 0x04 ;
 static unsigned char XG27_SR41 = 0x00 ;
 
+static unsigned char Z11m_CR97 = 0x80 ;
+
 static struct XGI330_VCLKDataStruct XGI_VCLKData[] = {
        /* SR2B,SR2C,SR2D */
        {0x1B, 0xE1,  25}, /* 00 (25.175MHz) */