staging: xgifb: delete IF_DEF_ScaleLCD
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:
parent
3d6defadda
commit
aef6bc7458
|
@ -2490,40 +2490,36 @@ static void XGI_ModCRT1Regs(unsigned short ModeNo, unsigned short ModeIdIndex,
|
||||||
|
|
||||||
index = index & IndexMask;
|
index = index & IndexMask;
|
||||||
|
|
||||||
if ((pVBInfo->IF_DEF_ScaleLCD == 0) ||
|
tempbx = 0;
|
||||||
((pVBInfo->IF_DEF_ScaleLCD == 1) &&
|
|
||||||
(!(pVBInfo->LCDInfo & EnableScalingLCD)))) {
|
|
||||||
tempbx = 0;
|
|
||||||
|
|
||||||
if (pVBInfo->VBInfo & (SetCRT2ToLCD | SetCRT2ToLCDA)) {
|
if (pVBInfo->VBInfo & (SetCRT2ToLCD | SetCRT2ToLCDA)) {
|
||||||
LCDPtr = (struct XGI_LVDSCRT1HDataStruct *)
|
LCDPtr = (struct XGI_LVDSCRT1HDataStruct *)
|
||||||
XGI_GetLcdPtr(tempbx, ModeNo,
|
XGI_GetLcdPtr(tempbx, ModeNo,
|
||||||
ModeIdIndex,
|
ModeIdIndex,
|
||||||
RefreshRateTableIndex,
|
RefreshRateTableIndex,
|
||||||
pVBInfo);
|
pVBInfo);
|
||||||
|
|
||||||
for (i = 0; i < 8; i++)
|
for (i = 0; i < 8; i++)
|
||||||
pVBInfo->TimingH[0].data[i] = LCDPtr[0].Reg[i];
|
pVBInfo->TimingH[0].data[i] = LCDPtr[0].Reg[i];
|
||||||
}
|
|
||||||
|
|
||||||
XGI_SetCRT1Timing_H(pVBInfo, HwDeviceExtension);
|
|
||||||
|
|
||||||
tempbx = 1;
|
|
||||||
|
|
||||||
if (pVBInfo->VBInfo & (SetCRT2ToLCD | SetCRT2ToLCDA)) {
|
|
||||||
LCDPtr1 = (struct XGI_LVDSCRT1VDataStruct *)
|
|
||||||
XGI_GetLcdPtr(
|
|
||||||
tempbx,
|
|
||||||
ModeNo,
|
|
||||||
ModeIdIndex,
|
|
||||||
RefreshRateTableIndex,
|
|
||||||
pVBInfo);
|
|
||||||
for (i = 0; i < 7; i++)
|
|
||||||
pVBInfo->TimingV[0].data[i] = LCDPtr1[0].Reg[i];
|
|
||||||
}
|
|
||||||
|
|
||||||
XGI_SetCRT1Timing_V(ModeIdIndex, ModeNo, pVBInfo);
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
XGI_SetCRT1Timing_H(pVBInfo, HwDeviceExtension);
|
||||||
|
|
||||||
|
tempbx = 1;
|
||||||
|
|
||||||
|
if (pVBInfo->VBInfo & (SetCRT2ToLCD | SetCRT2ToLCDA)) {
|
||||||
|
LCDPtr1 = (struct XGI_LVDSCRT1VDataStruct *)
|
||||||
|
XGI_GetLcdPtr(
|
||||||
|
tempbx,
|
||||||
|
ModeNo,
|
||||||
|
ModeIdIndex,
|
||||||
|
RefreshRateTableIndex,
|
||||||
|
pVBInfo);
|
||||||
|
for (i = 0; i < 7; i++)
|
||||||
|
pVBInfo->TimingV[0].data[i] = LCDPtr1[0].Reg[i];
|
||||||
|
}
|
||||||
|
|
||||||
|
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;
|
||||||
|
|
|
@ -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*/
|
||||||
|
|
Loading…
Reference in New Issue