Commit 0904f7f3 authored by Aaro Koskinen's avatar Aaro Koskinen Committed by Greg Kroah-Hartman

staging: xgifb: eliminate pVBInfo->SR16

Inline constant values that are used only once.
Signed-off-by: default avatarAaro Koskinen <aaro.koskinen@iki.fi>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 5ce24760
...@@ -94,8 +94,8 @@ static void XGINew_DDR1x_MRS_340(unsigned long P3c4, ...@@ -94,8 +94,8 @@ static void XGINew_DDR1x_MRS_340(unsigned long P3c4,
0x18, 0x18,
pVBInfo->SR15[2][pVBInfo->ram_type]); /* SR18 */ pVBInfo->SR15[2][pVBInfo->ram_type]); /* SR18 */
xgifb_reg_set(P3c4, 0x19, 0x01); xgifb_reg_set(P3c4, 0x19, 0x01);
xgifb_reg_set(P3c4, 0x16, pVBInfo->SR16[0]); xgifb_reg_set(P3c4, 0x16, 0x03);
xgifb_reg_set(P3c4, 0x16, pVBInfo->SR16[1]); xgifb_reg_set(P3c4, 0x16, 0x83);
mdelay(1); mdelay(1);
xgifb_reg_set(P3c4, 0x1B, 0x03); xgifb_reg_set(P3c4, 0x1B, 0x03);
udelay(500); udelay(500);
...@@ -103,8 +103,8 @@ static void XGINew_DDR1x_MRS_340(unsigned long P3c4, ...@@ -103,8 +103,8 @@ static void XGINew_DDR1x_MRS_340(unsigned long P3c4,
0x18, 0x18,
pVBInfo->SR15[2][pVBInfo->ram_type]); /* SR18 */ pVBInfo->SR15[2][pVBInfo->ram_type]); /* SR18 */
xgifb_reg_set(P3c4, 0x19, 0x00); xgifb_reg_set(P3c4, 0x19, 0x00);
xgifb_reg_set(P3c4, 0x16, pVBInfo->SR16[2]); xgifb_reg_set(P3c4, 0x16, 0x03);
xgifb_reg_set(P3c4, 0x16, pVBInfo->SR16[3]); xgifb_reg_set(P3c4, 0x16, 0x83);
xgifb_reg_set(P3c4, 0x1B, 0x00); xgifb_reg_set(P3c4, 0x1B, 0x00);
} }
......
...@@ -34,7 +34,6 @@ void InitTo330Pointer(unsigned char ChipType, struct vb_device_info *pVBInfo) ...@@ -34,7 +34,6 @@ void InitTo330Pointer(unsigned char ChipType, struct vb_device_info *pVBInfo)
pVBInfo->SR15 = XGI340_SR13; pVBInfo->SR15 = XGI340_SR13;
pVBInfo->CR40 = XGI340_cr41; pVBInfo->CR40 = XGI340_cr41;
pVBInfo->AGPReg = XGI340_AGPReg; pVBInfo->AGPReg = XGI340_AGPReg;
pVBInfo->SR16 = XGI340_SR16;
/* 310 customization related */ /* 310 customization related */
if ((pVBInfo->VBType & VB_SIS301LV) || (pVBInfo->VBType & VB_SIS302LV)) if ((pVBInfo->VBType & VB_SIS301LV) || (pVBInfo->VBType & VB_SIS302LV))
......
...@@ -162,7 +162,6 @@ struct vb_device_info { ...@@ -162,7 +162,6 @@ struct vb_device_info {
unsigned char (*CR40)[8]; unsigned char (*CR40)[8];
unsigned char *AGPReg; unsigned char *AGPReg;
unsigned char *SR16;
struct SiS_MCLKData *MCLKData; struct SiS_MCLKData *MCLKData;
unsigned char *pXGINew_DRAMTypeDefinition; unsigned char *pXGINew_DRAMTypeDefinition;
......
...@@ -120,8 +120,6 @@ static unsigned char XGI340_AGPReg[12] = { ...@@ -120,8 +120,6 @@ static unsigned char XGI340_AGPReg[12] = {
0x00, 0x05, 0xd0, 0x10, 0x10, 0x00 0x00, 0x05, 0xd0, 0x10, 0x10, 0x00
}; };
static unsigned char XGI340_SR16[4] = {0x03, 0x83, 0x03, 0x83};
const struct XGI_ExtStruct XGI330_EModeIDTable[] = { const struct XGI_ExtStruct XGI330_EModeIDTable[] = {
{0x2e, 0x0a1b, 0x0306, 0x06, 0x05, 0x06}, {0x2e, 0x0a1b, 0x0306, 0x06, 0x05, 0x06},
{0x2f, 0x0a1b, 0x0305, 0x05, 0x05, 0x05}, {0x2f, 0x0a1b, 0x0305, 0x05, 0x05, 0x05},
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment