sisusb: Add default modes 1280x1024 and 1152x864XORG-6_8_99_3XORG-6_8_99_2XORG-6_8_99_1

3 files changed, 28 insertions, 1 deletions

diff --git a/src/sisusb_driver.h b/src/sisusb_driver.h
index 81139c6..4ca39d2 100644
--- a/src/sisusb_driver.h
+++ b/src/sisusb_driver.h
@@ -61,8 +61,11 @@ static const struct _sis_vrate {
 	{1, 1024,  768,  43}, {2, 1024,  768,  60}, {3, 1024,  768,  70},
 	{4, 1024,  768,  75}, {5, 1024,  768,  85}, {6, 1024,  768, 100},
 	{7, 1024,  768, 120},
+	{1, 1152,  864,  60}, {1, 1152,  864,  75}, {2, 1152,  864,  84},
 	{1, 1280,  720,  60}, {2, 1280,  720,  75}, {3, 1280,  720,  85},
 	{1, 1280,  768,  60},
+	{1, 1280, 1024,  43}, {2, 1280, 1024,  60}, {3, 1280, 1024,  75},
+	{4, 1280, 1024,  85},
 	{0,    0,    0,   0}
 };
 
diff --git a/src/sisusb_init.c b/src/sisusb_init.c
index 3819129..fc2ca72 100644
--- a/src/sisusb_init.c
+++ b/src/sisusb_init.c
@@ -107,6 +107,9 @@ SiSUSB_GetModeID(int VGAEngine, ULONG VBFlags, int HDisplay, int VDisplay,
           if(VDisplay == 576)      ModeIndex = ModeIndex_1024x576[Depth];
           else if(VDisplay == 768) ModeIndex = ModeIndex_1024x768[Depth];
           break;
+     case 1152:
+	  if(VDisplay == 864)      ModeIndex = ModeIndex_1152x864[Depth];
+	  break;
      case 1280:
           switch(VDisplay) {
 	  case 720:
@@ -115,6 +118,9 @@ SiSUSB_GetModeID(int VGAEngine, ULONG VBFlags, int HDisplay, int VDisplay,
 	  case 768:
 	     ModeIndex = ModeIndex_1280x768[Depth];
 	     break;
+	  case 1024:
+	     ModeIndex = ModeIndex_1280x1024[Depth];
+	     break;
 	  }
    }
 
diff --git a/src/sisusb_init.h b/src/sisusb_init.h
index f9b6cf3..1674295 100644
--- a/src/sisusb_init.h
+++ b/src/sisusb_init.h
@@ -184,8 +184,10 @@ static const USHORT ModeIndex_960x540[]   = {0x1d, 0x1e, 0x00, 0x1f};
 static const USHORT ModeIndex_960x600[]   = {0x20, 0x21, 0x00, 0x22};
 static const USHORT ModeIndex_1024x768[]  = {0x38, 0x4a, 0x00, 0x64};
 static const USHORT ModeIndex_1024x576[]  = {0x71, 0x74, 0x00, 0x77};
+static const USHORT ModeIndex_1152x864[]  = {0x29, 0x2a, 0x00, 0x2b};
 static const USHORT ModeIndex_1280x720[]  = {0x79, 0x75, 0x00, 0x78};
 static const USHORT ModeIndex_1280x768[]  = {0x23, 0x24, 0x00, 0x25};
+static const USHORT ModeIndex_1280x1024[] = {0x3a, 0x4d, 0x00, 0x65};
 
 static const USHORT SiS_VGA_DAC[] =
 {
@@ -269,10 +271,12 @@ static const SiS_ExtStruct  SiSUSB_EModeIDTable[]=
 	{0x35,0x4a1f,0x0000,SIS_RI_720x480,  0x00,0x00,0x06,0x06,0x11,-1}, /* 720x480x32 */
 	{0x36,0x6a1f,0x0000,SIS_RI_720x576,  0x00,0x00,0x06,0x06,0x12,-1}, /* 720x576x32 */
 	{0x38,0x0a1b,0x0105,SIS_RI_1024x768, 0x00,0x00,0x08,0x07,0x13, 4}, /* 1024x768x8 */
+	{0x3a,0x0e3b,0x0107,SIS_RI_1280x1024,0x00,0x00,0x00,0x00,0x2f, 8}, /* 1280x1024x8 */
 	{0x41,0x9a1d,0x010e,SIS_RI_320x200,  0x00,0x00,0x04,0x04,0x1a, 0}, /* 320x200x16 */
 	{0x44,0x0a1d,0x0111,SIS_RI_640x480,  0x00,0x00,0x05,0x05,0x08, 2}, /* 640x480x16 */
 	{0x47,0x2a1d,0x0114,SIS_RI_800x600,  0x00,0x00,0x07,0x06,0x00, 3}, /* 800x600x16 */
 	{0x4a,0x0a3d,0x0117,SIS_RI_1024x768, 0x00,0x00,0x08,0x07,0x13, 4}, /* 1024x768x16 */
+	{0x4d,0x0e7d,0x011a,SIS_RI_1280x1024,0x00,0x00,0x00,0x00,0x2f, 8}, /* 1280x1024x16 */
 	{0x50,0x9a1b,0x0132,SIS_RI_320x240,  0x00,0x00,0x04,0x04,0x1b, 2}, /* 320x240x8  */
 	{0x51,0xba1b,0x0133,SIS_RI_400x300,  0x00,0x00,0x07,0x07,0x1c, 3}, /* 400x300x8  */
 	{0x52,0xba1b,0x0134,SIS_RI_512x384,  0x00,0x00,0x00,0x00,0x1d, 4}, /* 512x384x8  */
@@ -286,6 +290,7 @@ static const SiS_ExtStruct  SiSUSB_EModeIDTable[]=
 	{0x62,0x0a3f,0x013a,SIS_RI_640x480,  0x00,0x00,0x05,0x05,0x08, 2}, /* 640x480x32 */
 	{0x63,0x2a3f,0x013b,SIS_RI_800x600,  0x00,0x00,0x07,0x06,0x00, 3}, /* 800x600x32 */
 	{0x64,0x0a7f,0x013c,SIS_RI_1024x768, 0x00,0x00,0x08,0x07,0x13, 4}, /* 1024x768x32 */
+	{0x65,0x0eff,0x013d,SIS_RI_1280x1024,0x00,0x00,0x00,0x00,0x2f, 8}, /* 1280x1024x32 */
 	{0x70,0x6a1b,0x0000,SIS_RI_800x480,  0x00,0x00,0x07,0x07,0x1e,-1}, /* 800x480x8 */
 	{0x71,0x4a1b,0x0000,SIS_RI_1024x576, 0x00,0x00,0x00,0x00,0x21,-1}, /* 1024x576x8 */
 	{0x74,0x4a1d,0x0000,SIS_RI_1024x576, 0x00,0x00,0x00,0x00,0x21,-1}, /* 1024x576x16 */
@@ -316,6 +321,9 @@ static const SiS_ExtStruct  SiSUSB_EModeIDTable[]=
 	{0x20,0x6a1b,0x0000,SIS_RI_960x600,  0x00,0x00,0x00,0x00,0x2e,-1}, /* 960x600 */
 	{0x21,0x6a3d,0x0000,SIS_RI_960x600,  0x00,0x00,0x00,0x00,0x2e,-1},
 	{0x22,0x6a7f,0x0000,SIS_RI_960x600,  0x00,0x00,0x00,0x00,0x2e,-1},
+	{0x29,0x4e1b,0x0000,SIS_RI_1152x864, 0x00,0x00,0x00,0x00,0x33,-1}, /* 1152x864 */
+	{0x2a,0x4e3d,0x0000,SIS_RI_1152x864, 0x00,0x00,0x00,0x00,0x33,-1},
+	{0x2b,0x4e7f,0x0000,SIS_RI_1152x864, 0x00,0x00,0x00,0x00,0x33,-1},
 	{0xff,0x0000,0x0000,0,               0x00,0x00,0x00,0x00,0x00,-1}
 };
 
@@ -368,6 +376,13 @@ static const SiS_Ext2Struct SiSUSB_RefIndex[]=
 	{0x006f,0x4d,0x71,0x06,0x15,0x5f, 768, 576, 0x30, 0x00, 0x00}, /* 0x2c 768x576-56Hz   */
 	{0x0067,0x52,0x6a,0x00,0x1c,0x1d, 960, 540, 0x30, 0x00, 0x00}, /* 0x2d 960x540 60Hz */
 	{0x0077,0x53,0x6b,0x0b,0x1d,0x20, 960, 600, 0x30, 0x00, 0x00}, /* 0x2e 960x600 60Hz */
+	{0x0087,0x1c,0x11,0x00,0x07,0x3a,1280,1024, 0x30, 0x00, 0x00}, /* 0x2f */
+	{0x0137,0x1d,0x19,0x07,0x07,0x3a,1280,1024, 0x00, 0x00, 0x00}, /* 0x30 */
+	{0x0107,0x1e,0x1e,0x00,0x07,0x3a,1280,1024, 0x00, 0x00, 0x00}, /* 0x31 */
+	{0x0207,0x1f,0x20,0x00,0x07,0x3a,1280,1024, 0x00, 0x00, 0x00}, /* 0x32 */
+	{0x0127,0x54,0x6d,0x00,0x1a,0x29,1152, 864, 0x30, 0x00, 0x00}, /* 0x33 1152x864-60Hz  */
+	{0x0127,0x44,0x19,0x00,0x1a,0x29,1152, 864, 0x30, 0x00, 0x00}, /* 0x34 1152x864-75Hz  */
+	{0x0127,0x4a,0x1e,0x00,0x1a,0x29,1152, 864, 0x30, 0x00, 0x00}, /* 0x35 1152x864-85Hz  */
 	{0xffff,0x00,0x00,0x00,0x00,0x00,   0,   0,    0, 0x00, 0x00}
 };
 
@@ -624,7 +639,10 @@ static const SiS_CRT1TableStruct SiSUSB_CRT1Table[]=
    0x41}},  /* 0x52 */
  {{0x87,0x77,0x77,0x8b,0x81,0x0b,0x68,0xf0, /* 960x600-60 */
    0x5a,0x80,0x57,0x57,0x69,0x00,0x00,0x02,
-   0x01}}   /* 0x53 */
+   0x01}},  /* 0x53 */
+ {{0xcd,0x8f,0x8f,0x91,0x9b,0x1b,0x7a,0xff, /* 1152x864-60 */
+   0x64,0x8c,0x5f,0x62,0x7b,0x10,0x00,0x07,
+   0x41}}   /* 0x54 */
 };
 
 static SiS_VCLKDataStruct SiSUSB_VCLKData[]=