提交 ebe7846d 编写于 作者: A Aaro Koskinen 提交者: Greg Kroah-Hartman

staging: xgifb: delete unsupported chip types

The probe routine will fail if the chip is other than XG40..XG27, so
the other types can be dropped.
Signed-off-by: NAaro Koskinen <aaro.koskinen@iki.fi>
Signed-off-by: NGreg Kroah-Hartman <gregkh@suse.de>
上级 cc1e2398
...@@ -182,8 +182,6 @@ static int XGIfb_mode_rate_to_dclock(struct vb_device_info *XGI_Pr, ...@@ -182,8 +182,6 @@ static int XGIfb_mode_rate_to_dclock(struct vb_device_info *XGI_Pr,
*/ */
ClockIndex = XGI_Pr->RefIndex[RefreshRateTableIndex].Ext_CRTVCLK; ClockIndex = XGI_Pr->RefIndex[RefreshRateTableIndex].Ext_CRTVCLK;
if (HwDeviceExtension->jChipType < XGI_315H)
ClockIndex &= 0x3F;
Clock = XGI_Pr->VCLKData[ClockIndex].CLOCK * 1000; Clock = XGI_Pr->VCLKData[ClockIndex].CLOCK * 1000;
...@@ -859,12 +857,6 @@ static int XGIfb_validate_mode(int myindex) ...@@ -859,12 +857,6 @@ static int XGIfb_validate_mode(int myindex)
if (XGIbios_mode[myindex].bpp == 32) if (XGIbios_mode[myindex].bpp == 32)
return -1; return -1;
} }
/* TW: LVDS/CHRONTEL only supports < 800 (1024 on 650/Ch7019) */
if (xgi_video_info.hasVB == HASVB_LVDS_CHRONTEL
|| xgi_video_info.hasVB == HASVB_CHRONTEL) {
if (xgi_video_info.chip < XGI_315H)
return -1;
}
break; break;
default: default:
return -1; return -1;
...@@ -1684,24 +1676,11 @@ static void XGIfb_detect_VB(void) ...@@ -1684,24 +1676,11 @@ static void XGIfb_detect_VB(void)
xgi_video_info.TV_plug = TVPLUG_SCART; xgi_video_info.TV_plug = TVPLUG_SCART;
if (xgi_video_info.TV_type == 0) { if (xgi_video_info.TV_type == 0) {
/* TW: PAL/NTSC changed for 650 */ inXGIIDXREG(XGICR, 0x38, temp);
if ((xgi_video_info.chip <= XGI_315PRO) || (xgi_video_info.chip if (temp & 0x10)
>= XGI_330)) { xgi_video_info.TV_type = TVMODE_PAL;
else
inXGIIDXREG(XGICR, 0x38, temp); xgi_video_info.TV_type = TVMODE_NTSC;
if (temp & 0x10)
xgi_video_info.TV_type = TVMODE_PAL;
else
xgi_video_info.TV_type = TVMODE_NTSC;
} else {
inXGIIDXREG(XGICR, 0x79, temp);
if (temp & 0x20)
xgi_video_info.TV_type = TVMODE_PAL;
else
xgi_video_info.TV_type = TVMODE_NTSC;
}
} }
/* TW: Copy forceCRT1 option to CRT1off if option is given */ /* TW: Copy forceCRT1 option to CRT1off if option is given */
......
...@@ -27,23 +27,6 @@ ...@@ -27,23 +27,6 @@
#endif #endif
enum XGI_CHIP_TYPE { enum XGI_CHIP_TYPE {
XGI_VGALegacy = 0,
XGI_300,
XGI_630,
XGI_730,
XGI_540,
XGI_315H,
XGI_315,
XGI_315PRO,
XGI_550,
XGI_640,
XGI_740,
XGI_650,
XGI_650M,
XGI_330 = 16,
XGI_660,
XGI_661,
XGI_760,
XG40 = 32, XG40 = 32,
XG41, XG41,
XG42, XG42,
...@@ -51,7 +34,6 @@ enum XGI_CHIP_TYPE { ...@@ -51,7 +34,6 @@ enum XGI_CHIP_TYPE {
XG20 = 48, XG20 = 48,
XG21, XG21,
XG27, XG27,
MAX_XGI_CHIP
}; };
enum xgi_tvtype { enum xgi_tvtype {
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册