---

yaml
---
r: 304283
b: refs/heads/master
c: 969f7f3
h: refs/heads/master
i:
  304281: c69c557
  304279: a3fab74
v: v3

[refs]

@@ -1,2 +1,2 @@
 ---
-refs/heads/master: ace1055e5eae9174489ff91ed7847fd6042ef891
+refs/heads/master: 969f7f3b1d90fa030f1ef16f4122b4ef4f08006d

trunk/drivers/staging/xgifb/vb_setmode.c

@@ -178,13 +178,7 @@ static unsigned char XGI_GetModePtr(unsigned short ModeNo,
 				    unsigned short ModeIdIndex,
 				    struct vb_device_info *pVBInfo)
 {
-	unsigned char index;
-
-	if (pVBInfo->ModeType <= 0x02)
-		index = 0x1B; /* 02 -> ModeEGA */
-	else
-		index = 0x0F;
-	return index; /* Get pVBInfo->StandTable index */
+	return 0x0F;
 }
 
 static void XGI_SetSeqRegs(unsigned short ModeNo,
@@ -1308,14 +1302,10 @@ static void XGI_SetCRT1ModeRegs(struct xgi_hw_device_info *HwDeviceExtension,
 
 	data = infoflag;
 	data2 = 0;
-
-	if (pVBInfo->ModeType > 0x02) {
-		data2 |= 0x02;
-		data3 = pVBInfo->ModeType - ModeVGA;
-		data3 = data3 << 2;
-		data2 |= data3;
-	}
-
+	data2 |= 0x02;
+	data3 = pVBInfo->ModeType - ModeVGA;
+	data3 = data3 << 2;
+	data2 |= data3;
 	data &= InterlaceMode;
 
 	if (data)
@@ -1346,16 +1336,10 @@ static void XGI_SetCRT1ModeRegs(struct xgi_hw_device_info *HwDeviceExtension,
 	if (modeflag & LineCompareOff)
 		data2 |= 0x08;
 
-	if (pVBInfo->ModeType == ModeEGA)
-		data2 |= 0x40;
-
 	xgifb_reg_and_or(pVBInfo->P3c4, 0x0F, ~0x48, data2);
 	data = 0x60;
-	if (pVBInfo->ModeType != ModeText) {
-		data = data ^ 0x60;
-		if (pVBInfo->ModeType != ModeEGA)
-			data = data ^ 0xA0;
-	}
+	data = data ^ 0x60;
+	data = data ^ 0xA0;
 	xgifb_reg_and_or(pVBInfo->P3c4, 0x21, 0x1F, data);
 
 	XGI_SetVCLKState(HwDeviceExtension, ModeNo, RefreshRateTableIndex,
@@ -4127,14 +4111,6 @@ static void XGI_SetLockRegs(unsigned short ModeNo, unsigned short ModeIdIndex,
 			if (pVBInfo->LCDResInfo != Panel_1280x960 &&
 			    pVBInfo->VGAHDE >= 800) {
 				temp -= 7;
-				if (pVBInfo->ModeType == ModeEGA &&
-				    pVBInfo->VGAVDE == 1024) {
-					temp += 15;
-					if (pVBInfo->LCDResInfo !=
-						Panel_1280x1024)
-						temp += 7;
-				}
-
 				if (pVBInfo->VGAHDE >= 1280 &&
 				    pVBInfo->LCDResInfo != Panel_1280x960 &&
 				    (pVBInfo->LCDInfo & LCDNonExpanding))
@@ -4822,16 +4798,6 @@ static void XGI_SetLCDRegs(unsigned short ModeNo, unsigned short ModeIdIndex,
 	xgifb_reg_and_or(pVBInfo->Part2Port, 0x2B, 0x0F, temp);
 	temp = 0x01;
 
-	if (pVBInfo->LCDResInfo == Panel_1280x1024) {
-		if (pVBInfo->ModeType == ModeEGA) {
-			if (pVBInfo->VGAHDE >= 1024) {
-				temp = 0x02;
-				if (pVBInfo->LCDInfo & XGI_LCDVESATiming)
-					temp = 0x01;
-			}
-		}
-	}
-
 	xgifb_reg_set(pVBInfo->Part2Port, 0x0B, temp);
 	tempbx = pVBInfo->VDE; /* RTVACTEO=(VDE-1)&0xFF */
 	push1 = tempbx;

trunk/drivers/staging/xgifb/vb_table.h

@@ -129,8 +129,6 @@ static unsigned char XG40_CRCF = 0x13;
 static unsigned char XG40_DRAMTypeDefinition = 0xFF ;
 
 static struct XGI_ExtStruct XGI330_EModeIDTable[] = {
-	{0x6a, 0x2212, 0x0407, 0x3a81, 0x0102, 0x08,
-		0x07, 0x00, 0x00, 0x07, 0x0e},
 	{0x2e, 0x0a1b, 0x0306, 0x3a57, 0x0101, 0x08,
 		0x06, 0x00, 0x00, 0x05, 0x06},
 	{0x2f, 0x0a1b, 0x0305, 0x3a50, 0x0100, 0x08,
@@ -149,8 +147,6 @@ static struct XGI_ExtStruct XGI330_EModeIDTable[] = {
 		0x0d, 0x00, 0x00, 0x06, 0x3d},
 	{0x36, 0x2a1f, 0x0a0e, 0x3b8c, 0x0000, 0x08,
 		0x0e, 0x00, 0x00, 0x06, 0x3e},
-	{0x37, 0x0212, 0x0508, 0x3aab, 0x0104, 0x08,
-		0x08, 0x00, 0x00, 0x00, 0x16},
 	{0x38, 0x0a1b, 0x0508, 0x3aab, 0x0105, 0x08,
 		0x08, 0x00, 0x00, 0x00, 0x16},
 	{0x3a, 0x0e3b, 0x0609, 0x3adc, 0x0107, 0x08,