Skip to content

L
linux
Commit acfe093e authored by Aaro Koskinen's avatar Aaro Koskinen Committed by Greg Kroah-Hartman
Browse files
Options

staging: xgifb: eliminate pVBInfo->VCLKData/VBVCLKData 

Access XGI_VCLKData and XGI_VBVCLKData directly and make them const.
Signed-off-by: default avatarAaro Koskinen <aaro.koskinen@iki.fi>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 9b047458
Show whitespace changes
Inline Side-by-side
Showing with 15 additions and 22 deletions
drivers/staging/xgifb/XGI_main_26.c
View file @ acfe093e
...@@ -75,7 +75,7 @@ static int XGIfb_mode_rate_to_dclock(struct vb_device_info *XGI_Pr, ...@@ -75,7 +75,7 @@ static int XGIfb_mode_rate_to_dclock(struct vb_device_info *XGI_Pr,
ClockIndex = XGI330_RefIndex[RefreshRateTableIndex].Ext_CRTVCLK; ClockIndex = XGI330_RefIndex[RefreshRateTableIndex].Ext_CRTVCLK;
Clock = XGI_Pr->VCLKData[ClockIndex].CLOCK * 1000; Clock = XGI_VCLKData[ClockIndex].CLOCK * 1000;
return Clock; return Clock;
} }
......
drivers/staging/xgifb/vb_def.h
View file @ acfe093e
...@@ -263,5 +263,6 @@ extern const struct XGI_ExtStruct XGI330_EModeIDTable[]; ...@@ -263,5 +263,6 @@ extern const struct XGI_ExtStruct XGI330_EModeIDTable[];
extern const struct XGI_Ext2Struct XGI330_RefIndex[]; extern const struct XGI_Ext2Struct XGI330_RefIndex[];
extern const struct XGI_CRT1TableStruct XGI_CRT1Table[]; extern const struct XGI_CRT1TableStruct XGI_CRT1Table[];
extern const struct XGI_ECLKDataStruct XGI340_ECLKData[]; extern const struct XGI_ECLKDataStruct XGI340_ECLKData[];
extern const struct SiS_VCLKData XGI_VCLKData[];
#endif #endif
drivers/staging/xgifb/vb_setmode.c
View file @ acfe093e
...@@ -24,8 +24,6 @@ static const unsigned short XGINew_VGA_DAC[] = { ...@@ -24,8 +24,6 @@ static const unsigned short XGINew_VGA_DAC[] = {
void InitTo330Pointer(unsigned char ChipType, struct vb_device_info *pVBInfo) void InitTo330Pointer(unsigned char ChipType, struct vb_device_info *pVBInfo)
{ {
pVBInfo->MCLKData = XGI340New_MCLKData; pVBInfo->MCLKData = XGI340New_MCLKData;
pVBInfo->VCLKData = XGI_VCLKData;
pVBInfo->VBVCLKData = XGI_VBVCLKData;
pVBInfo->ScreenOffset = XGI330_ScreenOffset; pVBInfo->ScreenOffset = XGI330_ScreenOffset;
pVBInfo->StResInfo = XGI330_StResInfo; pVBInfo->StResInfo = XGI330_StResInfo;
pVBInfo->ModeResInfo = XGI330_ModeResInfo; pVBInfo->ModeResInfo = XGI330_ModeResInfo;
...@@ -181,12 +179,12 @@ static unsigned char XGI_SetDefaultVCLK(struct vb_device_info *pVBInfo) ...@@ -181,12 +179,12 @@ static unsigned char XGI_SetDefaultVCLK(struct vb_device_info *pVBInfo)
{ {
xgifb_reg_and_or(pVBInfo->P3c4, 0x31, ~0x30, 0x20); xgifb_reg_and_or(pVBInfo->P3c4, 0x31, ~0x30, 0x20);
xgifb_reg_set(pVBInfo->P3c4, 0x2B, pVBInfo->VCLKData[0].SR2B); xgifb_reg_set(pVBInfo->P3c4, 0x2B, XGI_VCLKData[0].SR2B);
xgifb_reg_set(pVBInfo->P3c4, 0x2C, pVBInfo->VCLKData[0].SR2C); xgifb_reg_set(pVBInfo->P3c4, 0x2C, XGI_VCLKData[0].SR2C);
xgifb_reg_and_or(pVBInfo->P3c4, 0x31, ~0x30, 0x10); xgifb_reg_and_or(pVBInfo->P3c4, 0x31, ~0x30, 0x10);
xgifb_reg_set(pVBInfo->P3c4, 0x2B, pVBInfo->VCLKData[1].SR2B); xgifb_reg_set(pVBInfo->P3c4, 0x2B, XGI_VCLKData[1].SR2B);
xgifb_reg_set(pVBInfo->P3c4, 0x2C, pVBInfo->VCLKData[1].SR2C); xgifb_reg_set(pVBInfo->P3c4, 0x2C, XGI_VCLKData[1].SR2C);
xgifb_reg_and(pVBInfo->P3c4, 0x31, ~0x30); xgifb_reg_and(pVBInfo->P3c4, 0x31, ~0x30);
return 0; return 0;
...@@ -961,10 +959,8 @@ static void XGI_SetCRT1VCLK(unsigned short ModeNo, ...@@ -961,10 +959,8 @@ static void XGI_SetCRT1VCLK(unsigned short ModeNo,
index = XGI330_RefIndex[RefreshRateTableIndex].Ext_CRTVCLK; index = XGI330_RefIndex[RefreshRateTableIndex].Ext_CRTVCLK;
data = xgifb_reg_get(pVBInfo->P3c4, 0x31) & 0xCF; data = xgifb_reg_get(pVBInfo->P3c4, 0x31) & 0xCF;
xgifb_reg_set(pVBInfo->P3c4, 0x31, data); xgifb_reg_set(pVBInfo->P3c4, 0x31, data);
xgifb_reg_set(pVBInfo->P3c4, 0x2B, xgifb_reg_set(pVBInfo->P3c4, 0x2B, XGI_VCLKData[index].SR2B);
pVBInfo->VCLKData[index].SR2B); xgifb_reg_set(pVBInfo->P3c4, 0x2C, XGI_VCLKData[index].SR2C);
xgifb_reg_set(pVBInfo->P3c4, 0x2C,
pVBInfo->VCLKData[index].SR2C);
xgifb_reg_set(pVBInfo->P3c4, 0x2D, 0x01); xgifb_reg_set(pVBInfo->P3c4, 0x2D, 0x01);
} else if ((pVBInfo->VBType & (VB_SIS301B | VB_SIS302B | VB_SIS301LV } else if ((pVBInfo->VBType & (VB_SIS301B | VB_SIS302B | VB_SIS301LV
| VB_SIS302LV | VB_XGI301C)) && (pVBInfo->VBInfo | VB_SIS302LV | VB_XGI301C)) && (pVBInfo->VBInfo
...@@ -974,19 +970,17 @@ static void XGI_SetCRT1VCLK(unsigned short ModeNo, ...@@ -974,19 +970,17 @@ static void XGI_SetCRT1VCLK(unsigned short ModeNo,
pVBInfo); pVBInfo);
data = xgifb_reg_get(pVBInfo->P3c4, 0x31) & 0xCF; data = xgifb_reg_get(pVBInfo->P3c4, 0x31) & 0xCF;
xgifb_reg_set(pVBInfo->P3c4, 0x31, data); xgifb_reg_set(pVBInfo->P3c4, 0x31, data);
data = pVBInfo->VBVCLKData[vclkindex].Part4_A; data = XGI_VBVCLKData[vclkindex].Part4_A;
xgifb_reg_set(pVBInfo->P3c4, 0x2B, data); xgifb_reg_set(pVBInfo->P3c4, 0x2B, data);
data = pVBInfo->VBVCLKData[vclkindex].Part4_B; data = XGI_VBVCLKData[vclkindex].Part4_B;
xgifb_reg_set(pVBInfo->P3c4, 0x2C, data); xgifb_reg_set(pVBInfo->P3c4, 0x2C, data);
xgifb_reg_set(pVBInfo->P3c4, 0x2D, 0x01); xgifb_reg_set(pVBInfo->P3c4, 0x2D, 0x01);
} else { } else {
index = XGI330_RefIndex[RefreshRateTableIndex].Ext_CRTVCLK; index = XGI330_RefIndex[RefreshRateTableIndex].Ext_CRTVCLK;
data = xgifb_reg_get(pVBInfo->P3c4, 0x31) & 0xCF; data = xgifb_reg_get(pVBInfo->P3c4, 0x31) & 0xCF;
xgifb_reg_set(pVBInfo->P3c4, 0x31, data); xgifb_reg_set(pVBInfo->P3c4, 0x31, data);
xgifb_reg_set(pVBInfo->P3c4, 0x2B, xgifb_reg_set(pVBInfo->P3c4, 0x2B, XGI_VCLKData[index].SR2B);
pVBInfo->VCLKData[index].SR2B); xgifb_reg_set(pVBInfo->P3c4, 0x2C, XGI_VCLKData[index].SR2C);
xgifb_reg_set(pVBInfo->P3c4, 0x2C,
pVBInfo->VCLKData[index].SR2C);
xgifb_reg_set(pVBInfo->P3c4, 0x2D, 0x01); xgifb_reg_set(pVBInfo->P3c4, 0x2D, 0x01);
} }
...@@ -1053,7 +1047,7 @@ static void XGI_SetVCLKState(struct xgi_hw_device_info *HwDeviceExtension, ...@@ -1053,7 +1047,7 @@ static void XGI_SetVCLKState(struct xgi_hw_device_info *HwDeviceExtension,
index = XGI330_RefIndex[RefreshRateTableIndex].Ext_CRTVCLK; index = XGI330_RefIndex[RefreshRateTableIndex].Ext_CRTVCLK;
index &= IndexMask; index &= IndexMask;
VCLK = pVBInfo->VCLKData[index].CLOCK; VCLK = XGI_VCLKData[index].CLOCK;
data = xgifb_reg_get(pVBInfo->P3c4, 0x32); data = xgifb_reg_get(pVBInfo->P3c4, 0x32);
data &= 0xf3; data &= 0xf3;
......
drivers/staging/xgifb/vb_struct.h
View file @ acfe093e
...@@ -179,8 +179,6 @@ struct vb_device_info { ...@@ -179,8 +179,6 @@ struct vb_device_info {
struct XGI_TimingHStruct TimingH; struct XGI_TimingHStruct TimingH;
struct XGI_TimingVStruct TimingV; struct XGI_TimingVStruct TimingV;
struct SiS_VCLKData *VCLKData;
struct SiS_VBVCLKData *VBVCLKData;
struct SiS_StResInfo_S *StResInfo; struct SiS_StResInfo_S *StResInfo;
struct SiS_ModeResInfo_S *ModeResInfo; struct SiS_ModeResInfo_S *ModeResInfo;
......
drivers/staging/xgifb/vb_table.h
View file @ acfe093e
...@@ -2157,7 +2157,7 @@ static struct SiS_ModeResInfo_S XGI330_ModeResInfo[] = { ...@@ -2157,7 +2157,7 @@ static struct SiS_ModeResInfo_S XGI330_ModeResInfo[] = {
{1152, 864, 8, 16} {1152, 864, 8, 16}
}; };
static struct SiS_VCLKData XGI_VCLKData[] = { const struct SiS_VCLKData XGI_VCLKData[] = {
/* SR2B,SR2C,SR2D */ /* SR2B,SR2C,SR2D */
{0x1B, 0xE1, 25}, /* 00 (25.175MHz) */ {0x1B, 0xE1, 25}, /* 00 (25.175MHz) */
{0x4E, 0xE4, 28}, /* 01 (28.322MHz) */ {0x4E, 0xE4, 28}, /* 01 (28.322MHz) */
...@@ -2250,7 +2250,7 @@ static struct SiS_VCLKData XGI_VCLKData[] = { ...@@ -2250,7 +2250,7 @@ static struct SiS_VCLKData XGI_VCLKData[] = {
{0xFF, 0x00, 0} /* End mark */ {0xFF, 0x00, 0} /* End mark */
}; };
static struct SiS_VBVCLKData XGI_VBVCLKData[] = { static const struct SiS_VBVCLKData XGI_VBVCLKData[] = {
{0x1B, 0xE1, 25}, /* 00 (25.175MHz) */ {0x1B, 0xE1, 25}, /* 00 (25.175MHz) */
{0x4E, 0xE4, 28}, /* 01 (28.322MHz) */ {0x4E, 0xE4, 28}, /* 01 (28.322MHz) */
{0x57, 0xE4, 31}, /* 02 (31.500MHz) */ {0x57, 0xE4, 31}, /* 02 (31.500MHz) */
......
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
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7