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

staging: xgifb: delete support for Chrontel 7017 TV output

Browse Source 
IF_DEF_CH7017 is hard-coded to 0, so this is all just dead code that
can be deleted.

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:45:56 +03:00
committed by Greg Kroah-Hartman
parent 9f52fc9a2d
commit a35cd0ba7f
3 changed files with 260 additions and 372 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
drivers/staging/xgifb/vb_def.h
View File

@@ -90,7 +90,6 @@
#define VB_XGI301LV 0x0008 #define VB_XGI301LV 0x0008
#define VB_XGI302LV 0x0010 #define VB_XGI302LV 0x0010
#define VB_LVDS_NS 0x0001 /* 3rd party chip */ #define VB_LVDS_NS 0x0001 /* 3rd party chip */
#define VB_CH7017 0x0002
#define VB_CH7007 0x0080 /* [Billy] 07/05/03 */ #define VB_CH7007 0x0080 /* [Billy] 07/05/03 */
#define ModeInfoFlag 0x0007 #define ModeInfoFlag 0x0007

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

@@ -2622,7 +2622,6 @@ static void XGI_GetLVDSData(unsigned short ModeNo, unsigned short ModeIdIndex,
{ {
unsigned short tempbx; unsigned short tempbx;
struct XGI330_LVDSDataStruct *LCDPtr = NULL; struct XGI330_LVDSDataStruct *LCDPtr = NULL;
struct XGI330_CHTVDataStruct *TVPtr = NULL;
tempbx = 2; tempbx = 2;
@@ -2635,17 +2634,6 @@ static void XGI_GetLVDSData(unsigned short ModeNo, unsigned short ModeIdIndex,
pVBInfo->HT = LCDPtr->LCDHT; pVBInfo->HT = LCDPtr->LCDHT;
pVBInfo->VT = LCDPtr->LCDVT; pVBInfo->VT = LCDPtr->LCDVT;
} }
if (pVBInfo->IF_DEF_CH7017 == 1) {
if (pVBInfo->VBInfo & SetCRT2ToTV) {
TVPtr = (struct XGI330_CHTVDataStruct *) XGI_GetTVPtr(
tempbx, ModeNo, ModeIdIndex,
RefreshRateTableIndex, pVBInfo);
pVBInfo->VGAHT = TVPtr->VGAHT;
pVBInfo->VGAVT = TVPtr->VGAVT;
pVBInfo->HT = TVPtr->LCDHT;
pVBInfo->VT = TVPtr->LCDVT;
}
}
if (pVBInfo->VBInfo & (SetCRT2ToLCD | SetCRT2ToLCDA)) { if (pVBInfo->VBInfo & (SetCRT2ToLCD | SetCRT2ToLCDA)) {
if (!(pVBInfo->LCDInfo & (SetLCDtoNonExpanding if (!(pVBInfo->LCDInfo & (SetLCDtoNonExpanding
@@ -2722,18 +2710,6 @@ static void XGI_ModCRT1Regs(unsigned short ModeNo, unsigned short ModeIdIndex,
} }
} }
/* if (pVBInfo->IF_DEF_CH7017 == 1) {
if (pVBInfo->VBInfo & SetCRT2ToTV)
TVPtr = (struct XGI330_CHTVDataStruct *)
XGI_GetTVPtr(
tempbx,
ModeNo,
ModeIdIndex,
RefreshRateTableIndex,
pVBInfo);
}
*/
XGI_SetCRT1Timing_H(pVBInfo, HwDeviceExtension); XGI_SetCRT1Timing_H(pVBInfo, HwDeviceExtension);
if (pVBInfo->IF_DEF_CH7007 == 1) { if (pVBInfo->IF_DEF_CH7007 == 1) {
@@ -2773,16 +2749,6 @@ static void XGI_ModCRT1Regs(unsigned short ModeNo, unsigned short ModeIdIndex,
CH7007TV_TimingVPtr[0].data[i]; CH7007TV_TimingVPtr[0].data[i];
} }
} }
/* if (pVBInfo->IF_DEF_CH7017 == 1) {
if (pVBInfo->VBInfo & SetCRT2ToTV)
TVPtr = (struct XGI330_CHTVDataStruct *)
XGI_GetTVPtr(tempbx,
ModeNo,
ModeIdIndex,
RefreshRateTableIndex,
pVBInfo);
}
*/
XGI_SetCRT1Timing_V(ModeIdIndex, ModeNo, pVBInfo); XGI_SetCRT1Timing_V(ModeIdIndex, ModeNo, pVBInfo);
@@ -2885,8 +2851,6 @@ static void XGI_SetLVDSRegs(unsigned short ModeNo, unsigned short ModeIdIndex,
modeflag = pVBInfo->SModeIDTable[ModeIdIndex].St_ModeFlag; modeflag = pVBInfo->SModeIDTable[ModeIdIndex].St_ModeFlag;
if (!(pVBInfo->SetFlag & Win9xDOSMode)) { if (!(pVBInfo->SetFlag & Win9xDOSMode)) {
if ((pVBInfo->IF_DEF_CH7017 == 0) || (pVBInfo->VBInfo
& (SetCRT2ToLCD | SetCRT2ToLCDA))) {
if (pVBInfo->IF_DEF_OEMUtil == 1) { if (pVBInfo->IF_DEF_OEMUtil == 1) {
tempbx = 8; tempbx = 8;
LCDPtr = (struct XGI330_LCDDataDesStruct *) LCDPtr = (struct XGI330_LCDDataDesStruct *)
@@ -3164,7 +3128,6 @@ static void XGI_SetLVDSRegs(unsigned short ModeNo, unsigned short ModeIdIndex,
xgifb_reg_set(pVBInfo->Part1Port, 0x23, xgifb_reg_set(pVBInfo->Part1Port, 0x23,
(unsigned short) (temp3 & 0xff)); (unsigned short) (temp3 & 0xff));
} }
}
} }
/* --------------------------------------------------------------------- */ /* --------------------------------------------------------------------- */
@@ -3264,22 +3227,6 @@ static unsigned char XGI_GetVCLKPtr(unsigned short RefreshRateTableIndex,
if (pVBInfo->VBInfo & SetCRT2ToTV) if (pVBInfo->VBInfo & SetCRT2ToTV)
return tempal; return tempal;
} }
/* else if ((pVBInfo->IF_DEF_CH7017==1) &&
(pVBInfo->VBType&VB_CH7017)) {
if (ModeNo<=0x13)
*tempal = pVBInfo->SModeIDTable[ModeIdIndex].
St_CRT2CRTC;
else
*tempal = pVBInfo->RefIndex[
RefreshRateTableIndex].Ext_CRT2CRTC;
*tempal = *tempal & 0x1F;
tempbx = 0;
if (pVBInfo->TVInfo & SetPALTV)
tempbx = tempbx + 2;
if (pVBInfo->TVInfo & SetCHTVOverScan)
tempbx++;
tempbx = tempbx << 1;
} */
} /* {End of VB} */ } /* {End of VB} */
if ((pVBInfo->IF_DEF_CH7007 == 1) && if ((pVBInfo->IF_DEF_CH7007 == 1) &&
@@ -3563,13 +3510,6 @@ void XGI_GetVBType(struct vb_device_info *pVBInfo)
} }
pVBInfo->VBType = tempbx; pVBInfo->VBType = tempbx;
} }
/*
else if (pVBInfo->IF_DEF_CH7017 == 1)
pVBInfo->VBType = VB_CH7017;
else //LVDS
pVBInfo->VBType = VB_LVDS_NS;
*/
} }
void XGI_GetVBInfo(unsigned short ModeNo, unsigned short ModeIdIndex, void XGI_GetVBInfo(unsigned short ModeNo, unsigned short ModeIdIndex,
@@ -3627,17 +3567,6 @@ void XGI_GetVBInfo(unsigned short ModeNo, unsigned short ModeIdIndex,
SetCRT2ToLCDA; SetCRT2ToLCDA;
} }
} }
} else if (pVBInfo->IF_DEF_CH7017 == 1) {
if (pVBInfo->VBType & VB_CH7017) {
if (temp & EnableDualEdge) {
tempbx |=
SetCRT2ToDualEdge;
if (temp & SetToLCDA)
tempbx |=
SetCRT2ToLCDA;
}
}
} }
} }
} }
@@ -3648,8 +3577,6 @@ void XGI_GetVBInfo(unsigned short ModeNo, unsigned short ModeIdIndex,
((pVBInfo->VBType & VB_XGI301LV) || ((pVBInfo->VBType & VB_XGI301LV) ||
(pVBInfo->VBType & VB_XGI302LV) || (pVBInfo->VBType & VB_XGI302LV) ||
(pVBInfo->VBType & VB_XGI301C))) || (pVBInfo->VBType & VB_XGI301C))) ||
((pVBInfo->IF_DEF_CH7017 == 1) &&
(pVBInfo->VBType & VB_CH7017)) ||
((pVBInfo->IF_DEF_CH7007 == 1) && ((pVBInfo->IF_DEF_CH7007 == 1) &&
(pVBInfo->VBType & VB_CH7007))) { (pVBInfo->VBType & VB_CH7007))) {
if (temp & SetYPbPr) { /* temp = CR38 */ if (temp & SetYPbPr) { /* temp = CR38 */
@@ -3690,12 +3617,8 @@ void XGI_GetVBInfo(unsigned short ModeNo, unsigned short ModeIdIndex,
temp = 0x017C; temp = 0x017C;
} }
} else { /* 3nd party chip */ } else { /* 3nd party chip */
if (pVBInfo->IF_DEF_CH7017 == 1)
temp = (SetCRT2ToTV |
SetCRT2ToLCD |
SetCRT2ToLCDA);
/* [Billy] 07/05/03 */ /* [Billy] 07/05/03 */
else if (pVBInfo->IF_DEF_CH7007 == 1) if (pVBInfo->IF_DEF_CH7007 == 1)
temp = SetCRT2ToTV; temp = SetCRT2ToTV;
else else
temp = SetCRT2ToLCD; temp = SetCRT2ToLCD;
@@ -3880,13 +3803,6 @@ void XGI_GetTVInfo(unsigned short ModeNo, unsigned short ModeIdIndex,
*/ */
} }
if (pVBInfo->IF_DEF_CH7017 == 1) {
tempbx = xgifb_reg_get(pVBInfo->P3d4, 0x35);
if (tempbx & TVOverScan)
tempbx |= SetCHTVOverScan;
}
if (pVBInfo->IF_DEF_CH7007 == 1) { /* [Billy] 07/05/04 */ if (pVBInfo->IF_DEF_CH7007 == 1) { /* [Billy] 07/05/04 */
tempbx = xgifb_reg_get(pVBInfo->P3d4, 0x35); tempbx = xgifb_reg_get(pVBInfo->P3d4, 0x35);
@@ -4028,11 +3944,6 @@ unsigned char XGI_GetLCDInfo(unsigned short ModeNo, unsigned short ModeIdIndex,
} }
} }
if (pVBInfo->IF_DEF_CH7017 == 1) {
if (tempax & LCDDualLink)
tempbx |= SetLCDDualLink;
}
if (pVBInfo->IF_DEF_LVDS == 0) { if (pVBInfo->IF_DEF_LVDS == 0) {
if ((pVBInfo->LCDResInfo == Panel1400x1050) && (pVBInfo->VBInfo if ((pVBInfo->LCDResInfo == Panel1400x1050) && (pVBInfo->VBInfo
& SetCRT2ToLCD) && (ModeNo > 0x13) && (resinfo & SetCRT2ToLCD) && (ModeNo > 0x13) && (resinfo
@@ -7209,27 +7120,6 @@ void XGI_DisableBridge(struct xgi_hw_device_info *HwDeviceExtension,
if (pVBInfo->SetFlag == Win9xDOSMode) if (pVBInfo->SetFlag == Win9xDOSMode)
return; return;
/*
if (CH7017) {
if (!(pVBInfo->VBInfo &
(SetCRT2ToLCD | SetCRT2toLCDA)) ||
(XGI_DisableChISLCD(pVBInfo))) {
if (!XGI_IsLCDON(pVBInfo)) {
if (DISCHARGE) {
tempbx = XGINew_GetCH7005(0x61);
// first time we power up
if (tempbx < 0x01)
// and disable power sequence
XGINew_SetCH7005(0x0066);
else
// leave VDD on - disable power
XGINew_SetCH7005(0x5f66);
}
}
}
}
*/
if (pVBInfo->VBType & (VB_XGI301B | VB_XGI302B | VB_XGI301LV if (pVBInfo->VBType & (VB_XGI301B | VB_XGI302B | VB_XGI301LV
| VB_XGI302LV | VB_XGI301C)) { | VB_XGI302LV | VB_XGI301C)) {
tempah = 0x3F; tempah = 0x3F;
@@ -8663,7 +8553,6 @@ unsigned char XGISetModeNew(struct xgi_hw_device_info *HwDeviceExtension,
pVBInfo->IF_DEF_LVDS = 0; pVBInfo->IF_DEF_LVDS = 0;
pVBInfo->IF_DEF_CH7005 = 0; pVBInfo->IF_DEF_CH7005 = 0;
pVBInfo->IF_DEF_LCDA = 1; pVBInfo->IF_DEF_LCDA = 1;
pVBInfo->IF_DEF_CH7017 = 0;
pVBInfo->IF_DEF_CH7007 = 0; /* [Billy] 2007/05/14 */ pVBInfo->IF_DEF_CH7007 = 0; /* [Billy] 2007/05/14 */
pVBInfo->IF_DEF_VideoCapture = 0; pVBInfo->IF_DEF_VideoCapture = 0;
pVBInfo->IF_DEF_ScaleLCD = 0; pVBInfo->IF_DEF_ScaleLCD = 0;

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

@@ -297,7 +297,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, IF_DEF_VideoCapture; unsigned short IF_DEF_CRT2Monitor, IF_DEF_VideoCapture;
unsigned short IF_DEF_LCDA, IF_DEF_CH7017, IF_DEF_YPbPr, unsigned short IF_DEF_LCDA, IF_DEF_YPbPr,
IF_DEF_ScaleLCD, IF_DEF_OEMUtil, IF_DEF_PWD; IF_DEF_ScaleLCD, IF_DEF_OEMUtil, IF_DEF_PWD;
unsigned short IF_DEF_ExpLink; unsigned short IF_DEF_ExpLink;
unsigned short IF_DEF_CH7005, IF_DEF_HiVision; unsigned short IF_DEF_CH7005, IF_DEF_HiVision;