leandrof/linux
1
0
Fork 0
forked from Minki/linux
Code Issues Pull Requests Packages Projects Releases Wiki Activity

staging: xgifb: delete unsupported chip types

Browse Source 
The probe routine will fail if the chip is other than XG40..XG27, so
the other types can be dropped.

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-03-13 12:26:08 +02:00 committed by Greg Kroah-Hartman
parent cc1e2398f7
commit ebe7846def
2 changed files with 5 additions and 44 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
drivers/staging/xgifb/XGI_main_26.c
View File

@ -182,8 +182,6 @@ static int XGIfb_mode_rate_to_dclock(struct vb_device_info *XGI_Pr,
*/
ClockIndex = XGI_Pr->RefIndex[RefreshRateTableIndex].Ext_CRTVCLK;
if (HwDeviceExtension->jChipType < XGI_315H)
ClockIndex &= 0x3F;
Clock = XGI_Pr->VCLKData[ClockIndex].CLOCK * 1000;
@ -859,12 +857,6 @@ static int XGIfb_validate_mode(int myindex)
if (XGIbios_mode[myindex].bpp == 32)
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;
default:
return -1;
@ -1684,24 +1676,11 @@ static void XGIfb_detect_VB(void)
xgi_video_info.TV_plug = TVPLUG_SCART;
if (xgi_video_info.TV_type == 0) {
/* TW: PAL/NTSC changed for 650 */
if ((xgi_video_info.chip <= XGI_315PRO) || (xgi_video_info.chip
>= XGI_330)) {
inXGIIDXREG(XGICR, 0x38, temp);
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;
}
inXGIIDXREG(XGICR, 0x38, temp);
if (temp & 0x10)
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 */

18
drivers/staging/xgifb/XGIfb.h
View File

@ -27,23 +27,6 @@
#endif
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,
XG41,
XG42,
@ -51,7 +34,6 @@ enum XGI_CHIP_TYPE {
XG20 = 48,
XG21,
XG27,
MAX_XGI_CHIP
};
enum xgi_tvtype {