lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

staging: xgifb: delete IF_DEF_ScaleLCD

Browse Source 
Delete one more disabled feature.

Signed-off-by: Aaro Koskinen <aaro.koskinen@iki.fi>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
This commit is contained in:
Aaro Koskinen
2011-08-31 21:46:15 +03:00
committed by Greg Kroah-Hartman
parent 3d6defadda
commit aef6bc7458
2 changed files with 28 additions and 48 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
drivers/staging/xgifb/vb_setmode.c
View File

@@ -2490,9 +2490,6 @@ static void XGI_ModCRT1Regs(unsigned short ModeNo, unsigned short ModeIdIndex,
index = index & IndexMask; index = index & IndexMask;
if ((pVBInfo->IF_DEF_ScaleLCD == 0) ||
((pVBInfo->IF_DEF_ScaleLCD == 1) &&
(!(pVBInfo->LCDInfo & EnableScalingLCD)))) {
tempbx = 0; tempbx = 0;
if (pVBInfo->VBInfo & (SetCRT2ToLCD | SetCRT2ToLCDA)) { if (pVBInfo->VBInfo & (SetCRT2ToLCD | SetCRT2ToLCDA)) {
@@ -2524,7 +2521,6 @@ static void XGI_ModCRT1Regs(unsigned short ModeNo, unsigned short ModeIdIndex,
XGI_SetCRT1Timing_V(ModeIdIndex, ModeNo, pVBInfo); XGI_SetCRT1Timing_V(ModeIdIndex, ModeNo, pVBInfo);
} }
}
static unsigned short XGI_GetLCDCapPtr(struct vb_device_info *pVBInfo) static unsigned short XGI_GetLCDCapPtr(struct vb_device_info *pVBInfo)
{ {
@@ -2660,12 +2656,6 @@ static void XGI_SetLVDSRegs(unsigned short ModeNo, unsigned short ModeIdIndex,
pVBInfo->VGAVDE = tempbx; pVBInfo->VGAVDE = tempbx;
} }
if ((pVBInfo->IF_DEF_ScaleLCD == 1) &&
(pVBInfo->LCDInfo & EnableScalingLCD)) {
tempax = pVBInfo->HDE;
tempbx = pVBInfo->VDE;
}
tempax = pVBInfo->HT; tempax = pVBInfo->HT;
if (pVBInfo->LCDInfo & EnableScalingLCD) if (pVBInfo->LCDInfo & EnableScalingLCD)
@@ -2889,11 +2879,6 @@ static void XGI_GetLCDVCLKPtr(unsigned char *di_0, unsigned char *di_1,
unsigned short index; unsigned short index;
if (pVBInfo->VBInfo & (SetCRT2ToLCD | SetCRT2ToLCDA)) { if (pVBInfo->VBInfo & (SetCRT2ToLCD | SetCRT2ToLCDA)) {
if (pVBInfo->IF_DEF_ScaleLCD == 1) {
if (pVBInfo->LCDInfo & EnableScalingLCD)
return;
}
/* index = XGI_GetLCDCapPtr(pVBInfo); */ /* index = XGI_GetLCDCapPtr(pVBInfo); */
index = XGI_GetLCDCapPtr1(pVBInfo); index = XGI_GetLCDCapPtr1(pVBInfo);
@@ -3545,9 +3530,6 @@ unsigned char XGI_GetLCDInfo(unsigned short ModeNo, unsigned short ModeIdIndex,
temp &= (ScalingLCD | LCDNonExpanding | LCDSyncBit | SetPWDEnable); temp &= (ScalingLCD | LCDNonExpanding | LCDSyncBit | SetPWDEnable);
if ((pVBInfo->IF_DEF_ScaleLCD == 1) && (temp & LCDNonExpanding))
temp &= ~EnableScalingLCD;
tempbx |= temp; tempbx |= temp;
LCDIdIndex = XGI_GetLCDCapPtr1(pVBInfo); LCDIdIndex = XGI_GetLCDCapPtr1(pVBInfo);
@@ -7800,7 +7782,6 @@ unsigned char XGISetModeNew(struct xgi_hw_device_info *HwDeviceExtension,
pVBInfo->BaseAddr = (unsigned long) HwDeviceExtension->pjIOAddress; pVBInfo->BaseAddr = (unsigned long) HwDeviceExtension->pjIOAddress;
pVBInfo->IF_DEF_LVDS = 0; pVBInfo->IF_DEF_LVDS = 0;
pVBInfo->IF_DEF_LCDA = 1; pVBInfo->IF_DEF_LCDA = 1;
pVBInfo->IF_DEF_ScaleLCD = 0;
if (HwDeviceExtension->jChipType >= XG20) { /* kuku 2004/06/25 */ if (HwDeviceExtension->jChipType >= XG20) { /* kuku 2004/06/25 */
pVBInfo->IF_DEF_YPbPr = 0; pVBInfo->IF_DEF_YPbPr = 0;

3
drivers/staging/xgifb/vb_struct.h
View File

@@ -289,8 +289,7 @@ struct vb_device_info {
/* ,IF_DEF_FSTN; add for dstn */ /* ,IF_DEF_FSTN; add for dstn */
unsigned short IF_DEF_LVDS, IF_DEF_TRUMPION, IF_DEF_DSTN; unsigned short IF_DEF_LVDS, IF_DEF_TRUMPION, IF_DEF_DSTN;
unsigned short IF_DEF_CRT2Monitor; unsigned short IF_DEF_CRT2Monitor;
unsigned short IF_DEF_LCDA, IF_DEF_YPbPr, unsigned short IF_DEF_LCDA, IF_DEF_YPbPr;
IF_DEF_ScaleLCD;
unsigned short IF_DEF_ExpLink; unsigned short IF_DEF_ExpLink;
unsigned short IF_DEF_HiVision; unsigned short IF_DEF_HiVision;
unsigned short LCDResInfo, LCDTypeInfo, VBType;/*301b*/ unsigned short LCDResInfo, LCDTypeInfo, VBType;/*301b*/