From de02317eceb0d616b1f8e8cfbd6b0cd137a4643e Mon Sep 17 00:00:00 2001
From: Aaro Koskinen <aaro.koskinen@iki.fi>
Date: Sun, 27 Nov 2011 23:03:08 +0200
Subject: [PATCH] --- yaml --- r: 281131 b: refs/heads/master c:
 a2d08cf38ab73910abaee0c75222bd1baa0c62f8 h: refs/heads/master i:   281129:
 da8c2433623f3f3403baacba29968b6607518ac9   281127:
 ec12816713424bc380e9915b0e6884fcf9de2c43 v: v3

---
 [refs]                                   |  2 +-
 trunk/drivers/staging/xgifb/vb_setmode.c | 28 ++++++++++++------------
 trunk/drivers/staging/xgifb/vb_setmode.h |  1 -
 3 files changed, 15 insertions(+), 16 deletions(-)

diff --git a/[refs] b/[refs]
index 6c26e56b4fac..2a3ada21acef 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: e85f203696f3751041d1537593990dd40e172ea2
+refs/heads/master: a2d08cf38ab73910abaee0c75222bd1baa0c62f8
diff --git a/trunk/drivers/staging/xgifb/vb_setmode.c b/trunk/drivers/staging/xgifb/vb_setmode.c
index 9b6d995766ba..8069246c3607 100644
--- a/trunk/drivers/staging/xgifb/vb_setmode.c
+++ b/trunk/drivers/staging/xgifb/vb_setmode.c
@@ -976,6 +976,20 @@ static void XGI_SetXG27CRTC(unsigned short ModeNo,
 	}
 }
 
+static void XGI_SetXG27FPBits(struct vb_device_info *pVBInfo)
+{
+	unsigned char temp;
+
+	/* D[1:0] 01: 18bit, 00: dual 12, 10: single 24 */
+	temp = xgifb_reg_get(pVBInfo->P3d4, 0x37);
+	temp = (temp & 3) << 6;
+	/* SR06[7]0: dual 12/1: single 24 [6] 18bit Dither <= 0 h/w recommend */
+	xgifb_reg_and_or(pVBInfo->P3c4, 0x06, ~0xc0, temp & 0x80);
+	/* SR09[7] enable FP output, SR09[6] 1: sigle 18bits, 0: 24bits */
+	xgifb_reg_and_or(pVBInfo->P3c4, 0x09, ~0xc0, temp | 0x80);
+
+}
+
 static void xgifb_set_lcd(int chip_id,
 			  struct vb_device_info *pVBInfo,
 			  unsigned short RefreshRateTableIndex,
@@ -6097,20 +6111,6 @@ unsigned char XGI_XG21CheckLVDSMode(unsigned short ModeNo,
 	return 1;
 }
 
-void XGI_SetXG27FPBits(struct vb_device_info *pVBInfo)
-{
-	unsigned char temp;
-
-	/* D[1:0] 01: 18bit, 00: dual 12, 10: single 24 */
-	temp = xgifb_reg_get(pVBInfo->P3d4, 0x37);
-	temp = (temp & 3) << 6;
-	/* SR06[7]0: dual 12/1: single 24 [6] 18bit Dither <= 0 h/w recommend */
-	xgifb_reg_and_or(pVBInfo->P3c4, 0x06, ~0xc0, temp & 0x80);
-	/* SR09[7] enable FP output, SR09[6] 1: sigle 18bits, 0: 24bits */
-	xgifb_reg_and_or(pVBInfo->P3c4, 0x09, ~0xc0, temp | 0x80);
-
-}
-
 static void xgifb_set_lvds(int chip_id,
 			   unsigned short ModeNo,
 			   unsigned short ModeIdIndex,
diff --git a/trunk/drivers/staging/xgifb/vb_setmode.h b/trunk/drivers/staging/xgifb/vb_setmode.h
index c4752cdb0220..9cc0f0d9306f 100644
--- a/trunk/drivers/staging/xgifb/vb_setmode.h
+++ b/trunk/drivers/staging/xgifb/vb_setmode.h
@@ -47,7 +47,6 @@ extern unsigned short XGI_GetRatePtrCRT2(struct xgi_hw_device_info *pXGIHWDE,
 					 unsigned short ModeNo,
 					 unsigned short ModeIdIndex,
 					 struct vb_device_info *);
-extern void XGI_SetXG27FPBits(struct vb_device_info *pVBInfo);
 extern void XGI_XG21BLSignalVDD(unsigned short tempbh,
 				unsigned short tempbl,
 				struct vb_device_info *pVBInfo);