Skip to content

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

staging: xgifb: delete support for Chrontel 7017 TV output 

IF_DEF_CH7017 is hard-coded to 0, so this is all just dead code that
can be deleted.
Signed-off-by: default avatarAaro Koskinen <aaro.koskinen@iki.fi>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@suse.de>
parent 9f52fc9a
Hide whitespace changes
Inline Side-by-side
Showing with 221 additions and 333 deletions
drivers/staging/xgifb/vb_def.h
View file @ a35cd0ba
...@@ -90,7 +90,6 @@ ...@@ -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
......
drivers/staging/xgifb/vb_setmode.c
View file @ a35cd0ba
...@@ -2622,7 +2622,6 @@ static void XGI_GetLVDSData(unsigned short ModeNo, unsigned short ModeIdIndex, ...@@ -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, ...@@ -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, ...@@ -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, ...@@ -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,285 +2851,282 @@ static void XGI_SetLVDSRegs(unsigned short ModeNo, unsigned short ModeIdIndex, ...@@ -2885,285 +2851,282 @@ 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 if (pVBInfo->IF_DEF_OEMUtil == 1) {
& (SetCRT2ToLCD | SetCRT2ToLCDA))) { tempbx = 8;
if (pVBInfo->IF_DEF_OEMUtil == 1) { LCDPtr = (struct XGI330_LCDDataDesStruct *)
tempbx = 8; XGI_GetLcdPtr(tempbx,
LCDPtr = (struct XGI330_LCDDataDesStruct *) ModeNo,
XGI_GetLcdPtr(tempbx, ModeIdIndex,
ModeNo, RefreshRateTableIndex,
ModeIdIndex, pVBInfo);
RefreshRateTableIndex, }
pVBInfo);
} if ((pVBInfo->IF_DEF_OEMUtil == 0) ||
(LCDPtr == NULL)) {
if ((pVBInfo->IF_DEF_OEMUtil == 0) || tempbx = 3;
(LCDPtr == NULL)) { if (pVBInfo->LCDInfo & EnableScalingLCD)
tempbx = 3; LCDPtr1 =
if (pVBInfo->LCDInfo & EnableScalingLCD) (struct XGI330_LCDDataDesStruct2 *)
LCDPtr1 = XGI_GetLcdPtr(
(struct XGI330_LCDDataDesStruct2 *) tempbx,
XGI_GetLcdPtr( ModeNo,
tempbx, ModeIdIndex,
ModeNo, RefreshRateTableIndex,
ModeIdIndex, pVBInfo);
RefreshRateTableIndex, else
pVBInfo); LCDPtr =
else (struct XGI330_LCDDataDesStruct *)
LCDPtr = XGI_GetLcdPtr(
(struct XGI330_LCDDataDesStruct *) tempbx,
XGI_GetLcdPtr( ModeNo,
tempbx, ModeIdIndex,
ModeNo, RefreshRateTableIndex,
ModeIdIndex, pVBInfo);
RefreshRateTableIndex, }
pVBInfo);
}
XGI_GetLCDSync(&tempax, &tempbx, pVBInfo); XGI_GetLCDSync(&tempax, &tempbx, pVBInfo);
push1 = tempbx; push1 = tempbx;
push2 = tempax; push2 = tempax;
/* GetLCDResInfo */ /* GetLCDResInfo */
if ((pVBInfo->LCDResInfo == Panel1024x768) || if ((pVBInfo->LCDResInfo == Panel1024x768) ||
(pVBInfo->LCDResInfo == Panel1024x768x75)) { (pVBInfo->LCDResInfo == Panel1024x768x75)) {
tempax = 1024; tempax = 1024;
tempbx = 768; tempbx = 768;
} else if ((pVBInfo->LCDResInfo == Panel1280x1024) || } else if ((pVBInfo->LCDResInfo == Panel1280x1024) ||
(pVBInfo->LCDResInfo == Panel1280x1024x75)) { (pVBInfo->LCDResInfo == Panel1280x1024x75)) {
tempax = 1280; tempax = 1280;
tempbx = 1024; tempbx = 1024;
} else if (pVBInfo->LCDResInfo == Panel1400x1050) { } else if (pVBInfo->LCDResInfo == Panel1400x1050) {
tempax = 1400; tempax = 1400;
tempbx = 1050; tempbx = 1050;
} else { } else {
tempax = 1600; tempax = 1600;
tempbx = 1200; tempbx = 1200;
} }
if (pVBInfo->LCDInfo & SetLCDtoNonExpanding) { if (pVBInfo->LCDInfo & SetLCDtoNonExpanding) {
pVBInfo->HDE = tempax; pVBInfo->HDE = tempax;
pVBInfo->VDE = tempbx; pVBInfo->VDE = tempbx;
pVBInfo->VGAHDE = tempax; pVBInfo->VGAHDE = tempax;
pVBInfo->VGAVDE = tempbx; pVBInfo->VGAVDE = tempbx;
} }
if ((pVBInfo->IF_DEF_ScaleLCD == 1) && if ((pVBInfo->IF_DEF_ScaleLCD == 1) &&
(pVBInfo->LCDInfo & EnableScalingLCD)) { (pVBInfo->LCDInfo & EnableScalingLCD)) {
tempax = pVBInfo->HDE; tempax = pVBInfo->HDE;
tempbx = pVBInfo->VDE; tempbx = pVBInfo->VDE;
} }
tempax = pVBInfo->HT; tempax = pVBInfo->HT;
if (pVBInfo->LCDInfo & EnableScalingLCD) if (pVBInfo->LCDInfo & EnableScalingLCD)
tempbx = LCDPtr1->LCDHDES; tempbx = LCDPtr1->LCDHDES;
else else
tempbx = LCDPtr->LCDHDES; tempbx = LCDPtr->LCDHDES;
tempcx = pVBInfo->HDE; tempcx = pVBInfo->HDE;
tempbx = tempbx & 0x0fff; tempbx = tempbx & 0x0fff;
tempcx += tempbx; tempcx += tempbx;
if (tempcx >= tempax) if (tempcx >= tempax)
tempcx -= tempax; tempcx -= tempax;
xgifb_reg_set(pVBInfo->Part1Port, 0x1A, tempbx & 0x07); xgifb_reg_set(pVBInfo->Part1Port, 0x1A, tempbx & 0x07);
tempcx = tempcx >> 3; tempcx = tempcx >> 3;
tempbx = tempbx >> 3; tempbx = tempbx >> 3;
xgifb_reg_set(pVBInfo->Part1Port, 0x16, xgifb_reg_set(pVBInfo->Part1Port, 0x16,
(unsigned short) (tempbx & 0xff)); (unsigned short) (tempbx & 0xff));
xgifb_reg_set(pVBInfo->Part1Port, 0x17, xgifb_reg_set(pVBInfo->Part1Port, 0x17,
(unsigned short) (tempcx & 0xff)); (unsigned short) (tempcx & 0xff));
tempax = pVBInfo->HT; tempax = pVBInfo->HT;
if (pVBInfo->LCDInfo & EnableScalingLCD) if (pVBInfo->LCDInfo & EnableScalingLCD)
tempbx = LCDPtr1->LCDHRS; tempbx = LCDPtr1->LCDHRS;
else else
tempbx = LCDPtr->LCDHRS; tempbx = LCDPtr->LCDHRS;
tempcx = push2; tempcx = push2;
if (pVBInfo->LCDInfo & EnableScalingLCD) if (pVBInfo->LCDInfo & EnableScalingLCD)
tempcx = LCDPtr1->LCDHSync; tempcx = LCDPtr1->LCDHSync;
tempcx += tempbx; tempcx += tempbx;
if (tempcx >= tempax) if (tempcx >= tempax)
tempcx -= tempax; tempcx -= tempax;
tempax = tempbx & 0x07; tempax = tempbx & 0x07;
tempax = tempax >> 5; tempax = tempax >> 5;
tempcx = tempcx >> 3; tempcx = tempcx >> 3;
tempbx = tempbx >> 3; tempbx = tempbx >> 3;
tempcx &= 0x1f; tempcx &= 0x1f;
tempax |= tempcx; tempax |= tempcx;
xgifb_reg_set(pVBInfo->Part1Port, 0x15, tempax); xgifb_reg_set(pVBInfo->Part1Port, 0x15, tempax);
xgifb_reg_set(pVBInfo->Part1Port, 0x14, xgifb_reg_set(pVBInfo->Part1Port, 0x14,
(unsigned short) (tempbx & 0xff)); (unsigned short) (tempbx & 0xff));
tempax = pVBInfo->VT; tempax = pVBInfo->VT;
if (pVBInfo->LCDInfo & EnableScalingLCD) if (pVBInfo->LCDInfo & EnableScalingLCD)
tempbx = LCDPtr1->LCDVDES; tempbx = LCDPtr1->LCDVDES;
else else
tempbx = LCDPtr->LCDVDES; tempbx = LCDPtr->LCDVDES;
tempcx = pVBInfo->VDE; tempcx = pVBInfo->VDE;
tempbx = tempbx & 0x0fff; tempbx = tempbx & 0x0fff;
tempcx += tempbx; tempcx += tempbx;
if (tempcx >= tempax) if (tempcx >= tempax)
tempcx -= tempax; tempcx -= tempax;
xgifb_reg_set(pVBInfo->Part1Port, 0x1b, xgifb_reg_set(pVBInfo->Part1Port, 0x1b,
(unsigned short) (tempbx & 0xff)); (unsigned short) (tempbx & 0xff));
xgifb_reg_set(pVBInfo->Part1Port, 0x1c, xgifb_reg_set(pVBInfo->Part1Port, 0x1c,
(unsigned short) (tempcx & 0xff)); (unsigned short) (tempcx & 0xff));
tempbx = (tempbx >> 8) & 0x07; tempbx = (tempbx >> 8) & 0x07;
tempcx = (tempcx >> 8) & 0x07; tempcx = (tempcx >> 8) & 0x07;
xgifb_reg_set(pVBInfo->Part1Port, 0x1d, xgifb_reg_set(pVBInfo->Part1Port, 0x1d,
(unsigned short) ((tempcx << 3) (unsigned short) ((tempcx << 3)
| tempbx)); | tempbx));
tempax = pVBInfo->VT; tempax = pVBInfo->VT;
if (pVBInfo->LCDInfo & EnableScalingLCD) if (pVBInfo->LCDInfo & EnableScalingLCD)
tempbx = LCDPtr1->LCDVRS; tempbx = LCDPtr1->LCDVRS;
else else
tempbx = LCDPtr->LCDVRS; tempbx = LCDPtr->LCDVRS;
/* tempbx = tempbx >> 4; */ /* tempbx = tempbx >> 4; */
tempcx = push1; tempcx = push1;
if (pVBInfo->LCDInfo & EnableScalingLCD) if (pVBInfo->LCDInfo & EnableScalingLCD)
tempcx = LCDPtr1->LCDVSync; tempcx = LCDPtr1->LCDVSync;
tempcx += tempbx; tempcx += tempbx;
if (tempcx >= tempax) if (tempcx >= tempax)
tempcx -= tempax; tempcx -= tempax;
xgifb_reg_set(pVBInfo->Part1Port, 0x18, xgifb_reg_set(pVBInfo->Part1Port, 0x18,
(unsigned short) (tempbx & 0xff)); (unsigned short) (tempbx & 0xff));
xgifb_reg_and_or(pVBInfo->Part1Port, 0x19, ~0x0f, xgifb_reg_and_or(pVBInfo->Part1Port, 0x19, ~0x0f,
(unsigned short) (tempcx & 0x0f)); (unsigned short) (tempcx & 0x0f));
tempax = ((tempbx >> 8) & 0x07) << 3; tempax = ((tempbx >> 8) & 0x07) << 3;
tempbx = pVBInfo->VGAVDE; tempbx = pVBInfo->VGAVDE;
if (tempbx != pVBInfo->VDE) if (tempbx != pVBInfo->VDE)
tempax |= 0x40; tempax |= 0x40;
if (pVBInfo->LCDInfo & EnableLVDSDDA) if (pVBInfo->LCDInfo & EnableLVDSDDA)
tempax |= 0x40; tempax |= 0x40;
xgifb_reg_and_or(pVBInfo->Part1Port, 0x1a, 0x07, xgifb_reg_and_or(pVBInfo->Part1Port, 0x1a, 0x07,
tempax); tempax);
tempcx = pVBInfo->VGAVT; tempcx = pVBInfo->VGAVT;
tempbx = pVBInfo->VDE; tempbx = pVBInfo->VDE;
tempax = pVBInfo->VGAVDE; tempax = pVBInfo->VGAVDE;
tempcx -= tempax; tempcx -= tempax;
temp = tempax; /* 0430 ylshieh */ temp = tempax; /* 0430 ylshieh */
temp1 = (temp << 18) / tempbx; temp1 = (temp << 18) / tempbx;
tempdx = (unsigned short) ((temp << 18) % tempbx); tempdx = (unsigned short) ((temp << 18) % tempbx);
if (tempdx != 0) if (tempdx != 0)
temp1 += 1; temp1 += 1;
temp2 = temp1; temp2 = temp1;
push3 = temp2; push3 = temp2;
xgifb_reg_set(pVBInfo->Part1Port, 0x37, xgifb_reg_set(pVBInfo->Part1Port, 0x37,
(unsigned short) (temp2 & 0xff)); (unsigned short) (temp2 & 0xff));
xgifb_reg_set(pVBInfo->Part1Port, 0x36, xgifb_reg_set(pVBInfo->Part1Port, 0x36,
(unsigned short) ((temp2 >> 8) & 0xff)); (unsigned short) ((temp2 >> 8) & 0xff));
tempbx = (unsigned short) (temp2 >> 16); tempbx = (unsigned short) (temp2 >> 16);
tempax = tempbx & 0x03; tempax = tempbx & 0x03;
tempbx = pVBInfo->VGAVDE; tempbx = pVBInfo->VGAVDE;
if (tempbx == pVBInfo->VDE) if (tempbx == pVBInfo->VDE)
tempax |= 0x04; tempax |= 0x04;
xgifb_reg_set(pVBInfo->Part1Port, 0x35, tempax);
if (pVBInfo->VBType & VB_XGI301C) {
temp2 = push3;
xgifb_reg_set(pVBInfo->Part4Port,
0x3c,
(unsigned short) (temp2 & 0xff));
xgifb_reg_set(pVBInfo->Part4Port,
0x3b,
(unsigned short) ((temp2 >> 8) &
0xff));
tempbx = (unsigned short) (temp2 >> 16);
xgifb_reg_and_or(pVBInfo->Part4Port, 0x3a,
~0xc0,
(unsigned short) ((tempbx &
0xff) << 6));
tempcx = pVBInfo->VGAVDE;
if (tempcx == pVBInfo->VDE)
xgifb_reg_and_or(pVBInfo->Part4Port,
0x30, ~0x0c, 0x00);
else
xgifb_reg_and_or(pVBInfo->Part4Port,
0x30, ~0x0c, 0x08);
}
tempcx = pVBInfo->VGAHDE; xgifb_reg_set(pVBInfo->Part1Port, 0x35, tempax);
tempbx = pVBInfo->HDE;
temp1 = tempcx << 16; if (pVBInfo->VBType & VB_XGI301C) {
temp2 = push3;
xgifb_reg_set(pVBInfo->Part4Port,
0x3c,
(unsigned short) (temp2 & 0xff));
xgifb_reg_set(pVBInfo->Part4Port,
0x3b,
(unsigned short) ((temp2 >> 8) &
0xff));
tempbx = (unsigned short) (temp2 >> 16);
xgifb_reg_and_or(pVBInfo->Part4Port, 0x3a,
~0xc0,
(unsigned short) ((tempbx &
0xff) << 6));
tempcx = pVBInfo->VGAVDE;
if (tempcx == pVBInfo->VDE)
xgifb_reg_and_or(pVBInfo->Part4Port,
0x30, ~0x0c, 0x00);
else
xgifb_reg_and_or(pVBInfo->Part4Port,
0x30, ~0x0c, 0x08);
}
tempax = (unsigned short) (temp1 / tempbx); tempcx = pVBInfo->VGAHDE;
tempbx = pVBInfo->HDE;
if ((tempbx & 0xffff) == (tempcx & 0xffff)) temp1 = tempcx << 16;
tempax = 65535;
temp3 = tempax; tempax = (unsigned short) (temp1 / tempbx);
temp1 = pVBInfo->VGAHDE << 16;
temp1 /= temp3; if ((tempbx & 0xffff) == (tempcx & 0xffff))
temp3 = temp3 << 16; tempax = 65535;
temp1 -= 1;
temp3 = (temp3 & 0xffff0000) + (temp1 & 0xffff); temp3 = tempax;
temp1 = pVBInfo->VGAHDE << 16;
tempax = (unsigned short) (temp3 & 0xff); temp1 /= temp3;
xgifb_reg_set(pVBInfo->Part1Port, 0x1f, tempax); temp3 = temp3 << 16;
temp1 -= 1;
temp1 = pVBInfo->VGAVDE << 18; temp3 = (temp3 & 0xffff0000) + (temp1 & 0xffff);
temp1 = temp1 / push3;
tempbx = (unsigned short) (temp1 & 0xffff);
if (pVBInfo->LCDResInfo == Panel1024x768) tempax = (unsigned short) (temp3 & 0xff);
tempbx -= 1; xgifb_reg_set(pVBInfo->Part1Port, 0x1f, tempax);
tempax = ((tempbx >> 8) & 0xff) << 3; temp1 = pVBInfo->VGAVDE << 18;
tempax |= (unsigned short) ((temp3 >> 8) & 0x07); temp1 = temp1 / push3;
xgifb_reg_set(pVBInfo->Part1Port, 0x20, tempbx = (unsigned short) (temp1 & 0xffff);
(unsigned short) (tempax & 0xff));
xgifb_reg_set(pVBInfo->Part1Port, 0x21,
(unsigned short) (tempbx & 0xff));
temp3 = temp3 >> 16; if (pVBInfo->LCDResInfo == Panel1024x768)
tempbx -= 1;
if (modeflag & HalfDCLK) tempax = ((tempbx >> 8) & 0xff) << 3;
temp3 = temp3 >> 1; tempax |= (unsigned short) ((temp3 >> 8) & 0x07);
xgifb_reg_set(pVBInfo->Part1Port, 0x20,
(unsigned short) (tempax & 0xff));
xgifb_reg_set(pVBInfo->Part1Port, 0x21,
(unsigned short) (tempbx & 0xff));
xgifb_reg_set(pVBInfo->Part1Port, 0x22, temp3 = temp3 >> 16;
(unsigned short) ((temp3 >> 8) & 0xff));
xgifb_reg_set(pVBInfo->Part1Port, 0x23, if (modeflag & HalfDCLK)
(unsigned short) (temp3 & 0xff)); temp3 = temp3 >> 1;
}
xgifb_reg_set(pVBInfo->Part1Port, 0x22,
(unsigned short) ((temp3 >> 8) & 0xff));
xgifb_reg_set(pVBInfo->Part1Port, 0x23,
(unsigned short) (temp3 & 0xff));
} }
} }
...@@ -3264,22 +3227,6 @@ static unsigned char XGI_GetVCLKPtr(unsigned short RefreshRateTableIndex, ...@@ -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) ...@@ -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, ...@@ -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, ...@@ -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, ...@@ -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, ...@@ -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, ...@@ -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, ...@@ -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, ...@@ -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;
......
drivers/staging/xgifb/vb_struct.h
View file @ a35cd0ba
...@@ -297,7 +297,7 @@ struct vb_device_info { ...@@ -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;
......
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