From f1416deac4b69fbcebaf1e2fbe5154c9fd5ac04a Mon Sep 17 00:00:00 2001
From: Aaro Koskinen <aaro.koskinen@iki.fi>
Date: Sun, 4 Nov 2012 21:14:57 +0200
Subject: [PATCH] --- yaml --- r: 337801 b: refs/heads/master c:
 9b0474581640a47678659900262607bd0fe8a2e4 h: refs/heads/master i:   337799:
 c2052b8ea9b47532d1f855beb35ce4cee4cd2c17 v: v3

---
 [refs]                                   |  2 +-
 trunk/drivers/staging/xgifb/vb_def.h     |  1 +
 trunk/drivers/staging/xgifb/vb_init.c    | 14 +++++++-------
 trunk/drivers/staging/xgifb/vb_setmode.c |  1 -
 trunk/drivers/staging/xgifb/vb_struct.h  |  1 -
 trunk/drivers/staging/xgifb/vb_table.h   |  2 +-
 6 files changed, 10 insertions(+), 11 deletions(-)

diff --git a/[refs] b/[refs]
index 084a58778095..3498438b1921 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 7e29d632f3e8ac2c4607e869f1601ac590d6e5f4
+refs/heads/master: 9b0474581640a47678659900262607bd0fe8a2e4
diff --git a/trunk/drivers/staging/xgifb/vb_def.h b/trunk/drivers/staging/xgifb/vb_def.h
index 0fd56fbcef03..274f8cc68a0d 100644
--- a/trunk/drivers/staging/xgifb/vb_def.h
+++ b/trunk/drivers/staging/xgifb/vb_def.h
@@ -262,5 +262,6 @@
 extern const struct XGI_ExtStruct XGI330_EModeIDTable[];
 extern const struct XGI_Ext2Struct XGI330_RefIndex[];
 extern const struct XGI_CRT1TableStruct XGI_CRT1Table[];
+extern const struct XGI_ECLKDataStruct XGI340_ECLKData[];
 
 #endif
diff --git a/trunk/drivers/staging/xgifb/vb_init.c b/trunk/drivers/staging/xgifb/vb_init.c
index 72a09601aef2..1be740cda81a 100644
--- a/trunk/drivers/staging/xgifb/vb_init.c
+++ b/trunk/drivers/staging/xgifb/vb_init.c
@@ -124,13 +124,13 @@ static void XGINew_SetMemoryClock(struct xgi_hw_device_info *HwDeviceExtension,
 
 	xgifb_reg_set(pVBInfo->P3c4,
 		      0x2E,
-		      pVBInfo->ECLKData[pVBInfo->ram_type].SR2E);
+		      XGI340_ECLKData[pVBInfo->ram_type].SR2E);
 	xgifb_reg_set(pVBInfo->P3c4,
 		      0x2F,
-		      pVBInfo->ECLKData[pVBInfo->ram_type].SR2F);
+		      XGI340_ECLKData[pVBInfo->ram_type].SR2F);
 	xgifb_reg_set(pVBInfo->P3c4,
 		      0x30,
-		      pVBInfo->ECLKData[pVBInfo->ram_type].SR30);
+		      XGI340_ECLKData[pVBInfo->ram_type].SR30);
 
 	/* When XG42 ECLK = MCLK = 207MHz, Set SR32 D[1:0] = 10b */
 	/* Modify SR32 value, when MCLK=207MHZ, ELCK=250MHz,
@@ -138,10 +138,10 @@ static void XGINew_SetMemoryClock(struct xgi_hw_device_info *HwDeviceExtension,
 	if (HwDeviceExtension->jChipType == XG42) {
 		if ((pVBInfo->MCLKData[pVBInfo->ram_type].SR28 == 0x1C) &&
 		    (pVBInfo->MCLKData[pVBInfo->ram_type].SR29 == 0x01) &&
-		    (((pVBInfo->ECLKData[pVBInfo->ram_type].SR2E == 0x1C) &&
-		      (pVBInfo->ECLKData[pVBInfo->ram_type].SR2F == 0x01)) ||
-		     ((pVBInfo->ECLKData[pVBInfo->ram_type].SR2E == 0x22) &&
-		      (pVBInfo->ECLKData[pVBInfo->ram_type].SR2F == 0x01))))
+		    (((XGI340_ECLKData[pVBInfo->ram_type].SR2E == 0x1C) &&
+		      (XGI340_ECLKData[pVBInfo->ram_type].SR2F == 0x01)) ||
+		     ((XGI340_ECLKData[pVBInfo->ram_type].SR2E == 0x22) &&
+		      (XGI340_ECLKData[pVBInfo->ram_type].SR2F == 0x01))))
 			xgifb_reg_set(pVBInfo->P3c4,
 				      0x32,
 				      ((unsigned char) xgifb_reg_get(
diff --git a/trunk/drivers/staging/xgifb/vb_setmode.c b/trunk/drivers/staging/xgifb/vb_setmode.c
index ba5ea68c35b9..832b254281ab 100644
--- a/trunk/drivers/staging/xgifb/vb_setmode.c
+++ b/trunk/drivers/staging/xgifb/vb_setmode.c
@@ -24,7 +24,6 @@ static const unsigned short XGINew_VGA_DAC[] = {
 void InitTo330Pointer(unsigned char ChipType, struct vb_device_info *pVBInfo)
 {
 	pVBInfo->MCLKData = XGI340New_MCLKData;
-	pVBInfo->ECLKData = XGI340_ECLKData;
 	pVBInfo->VCLKData = XGI_VCLKData;
 	pVBInfo->VBVCLKData = XGI_VBVCLKData;
 	pVBInfo->ScreenOffset = XGI330_ScreenOffset;
diff --git a/trunk/drivers/staging/xgifb/vb_struct.h b/trunk/drivers/staging/xgifb/vb_struct.h
index 5926f74861a3..f7c5ec150da1 100644
--- a/trunk/drivers/staging/xgifb/vb_struct.h
+++ b/trunk/drivers/staging/xgifb/vb_struct.h
@@ -169,7 +169,6 @@ struct vb_device_info {
 	unsigned char  SR22;
 	unsigned char  SR25;
 	struct SiS_MCLKData  *MCLKData;
-	struct XGI_ECLKDataStruct  *ECLKData;
 
 	unsigned char   *ScreenOffset;
 	unsigned char   *pXGINew_DRAMTypeDefinition;
diff --git a/trunk/drivers/staging/xgifb/vb_table.h b/trunk/drivers/staging/xgifb/vb_table.h
index 6291a1128939..d295eea63a54 100644
--- a/trunk/drivers/staging/xgifb/vb_table.h
+++ b/trunk/drivers/staging/xgifb/vb_table.h
@@ -22,7 +22,7 @@ static struct SiS_MCLKData XGI27New_MCLKData[] = {
 	{0x5c, 0x23, 0x01, 166}
 };
 
-static struct XGI_ECLKDataStruct XGI340_ECLKData[] = {
+const struct XGI_ECLKDataStruct XGI340_ECLKData[] = {
 	{0x5c, 0x23, 0x01, 166},
 	{0x55, 0x84, 0x01, 123},
 	{0x7C, 0x08, 0x01, 200},