From d902454e842c0915ea4c49306dc49b708dcedf3c Mon Sep 17 00:00:00 2001
From: Aaro Koskinen <aaro.koskinen@iki.fi>
Date: Tue, 8 Mar 2011 22:16:10 +0200
Subject: [PATCH] --- yaml --- r: 236358 b: refs/heads/master c:
 600a710b8bb414903a8b7c28e22ca03a60b8191f h: refs/heads/master v: v3

---
 [refs]                                 |  2 +-
 trunk/drivers/staging/xgifb/vb_init.c  | 44 ++++++++++++--------------
 trunk/drivers/staging/xgifb/vgatypes.h |  2 --
 3 files changed, 22 insertions(+), 26 deletions(-)

diff --git a/[refs] b/[refs]
index 4a9ed54efe13..d1a7c877ac88 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 66c2458c7943c29a2221896c213ec1d244c64ded
+refs/heads/master: 600a710b8bb414903a8b7c28e22ca03a60b8191f
diff --git a/trunk/drivers/staging/xgifb/vb_init.c b/trunk/drivers/staging/xgifb/vb_init.c
index 9a5aa6c9f929..e33259a5e860 100644
--- a/trunk/drivers/staging/xgifb/vb_init.c
+++ b/trunk/drivers/staging/xgifb/vb_init.c
@@ -388,34 +388,32 @@ unsigned char XGIInitNew(struct xgi_hw_device_info *HwDeviceExtension)
 		XGINew_SetReg1(pVBInfo->P3d4, 0x83, 0x00);
 	printk("181");
 
-	if (HwDeviceExtension->bSkipSense == 0) {
-		printk("182");
+	printk("182");
 
-		XGI_SenseCRT1(pVBInfo);
+	XGI_SenseCRT1(pVBInfo);
 
-		printk("183");
-		/* XGINew_DetectMonitor(HwDeviceExtension); */
-		pVBInfo->IF_DEF_CH7007 = 0;
-		if ((HwDeviceExtension->jChipType == XG21) && (pVBInfo->IF_DEF_CH7007)) {
-			printk("184");
-			XGI_GetSenseStatus(HwDeviceExtension, pVBInfo); /* sense CRT2 */
-			printk("185");
+	printk("183");
+	/* XGINew_DetectMonitor(HwDeviceExtension); */
+	pVBInfo->IF_DEF_CH7007 = 0;
+	if ((HwDeviceExtension->jChipType == XG21) && (pVBInfo->IF_DEF_CH7007)) {
+		printk("184");
+		XGI_GetSenseStatus(HwDeviceExtension, pVBInfo); /* sense CRT2 */
+		printk("185");
 
-		}
-		if (HwDeviceExtension->jChipType == XG21) {
-			printk("186");
+	}
+	if (HwDeviceExtension->jChipType == XG21) {
+		printk("186");
 
-			XGINew_SetRegANDOR(pVBInfo->P3d4, 0x32, ~Monitor1Sense, Monitor1Sense); /* Z9 default has CRT */
-			temp = GetXG21FPBits(pVBInfo);
-			XGINew_SetRegANDOR(pVBInfo->P3d4, 0x37, ~0x01, temp);
-			printk("187");
+		XGINew_SetRegANDOR(pVBInfo->P3d4, 0x32, ~Monitor1Sense, Monitor1Sense); /* Z9 default has CRT */
+		temp = GetXG21FPBits(pVBInfo);
+		XGINew_SetRegANDOR(pVBInfo->P3d4, 0x37, ~0x01, temp);
+		printk("187");
 
-		}
-		if (HwDeviceExtension->jChipType == XG27) {
-			XGINew_SetRegANDOR(pVBInfo->P3d4, 0x32, ~Monitor1Sense, Monitor1Sense); /* Z9 default has CRT */
-			temp = GetXG27FPBits(pVBInfo);
-			XGINew_SetRegANDOR(pVBInfo->P3d4, 0x37, ~0x03, temp);
-		}
+	}
+	if (HwDeviceExtension->jChipType == XG27) {
+		XGINew_SetRegANDOR(pVBInfo->P3d4, 0x32, ~Monitor1Sense, Monitor1Sense); /* Z9 default has CRT */
+		temp = GetXG27FPBits(pVBInfo);
+		XGINew_SetRegANDOR(pVBInfo->P3d4, 0x37, ~0x03, temp);
 	}
 	printk("19");
 
diff --git a/trunk/drivers/staging/xgifb/vgatypes.h b/trunk/drivers/staging/xgifb/vgatypes.h
index 13c02be38130..c4624ccb02b7 100644
--- a/trunk/drivers/staging/xgifb/vgatypes.h
+++ b/trunk/drivers/staging/xgifb/vgatypes.h
@@ -82,8 +82,6 @@ struct xgi_hw_device_info
 
     unsigned char bIntegratedMMEnabled;/* supporting integration MM enable */
 
-    unsigned char bSkipSense;
-
 	unsigned char(*pQueryVGAConfigSpace)(struct xgi_hw_device_info *,
 					    unsigned long, unsigned long,
 					    unsigned long *);