mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-08-26 19:00:25 +00:00
staging: xgifb: delete bSkipSense
bSkipSense is always false, thus redundant. Signed-off-by: Aaro Koskinen <aaro.koskinen@iki.fi> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
This commit is contained in:
parent
66c2458c79
commit
600a710b8b
2 changed files with 21 additions and 25 deletions
|
@ -388,34 +388,32 @@ unsigned char XGIInitNew(struct xgi_hw_device_info *HwDeviceExtension)
|
|||
XGINew_SetReg1(pVBInfo->P3d4, 0x83, 0x00);
|
||||
printk("181");
|
||||
|
||||
if (HwDeviceExtension->bSkipSense == 0) {
|
||||
printk("182");
|
||||
printk("182");
|
||||
|
||||
XGI_SenseCRT1(pVBInfo);
|
||||
XGI_SenseCRT1(pVBInfo);
|
||||
|
||||
printk("183");
|
||||
/* XGINew_DetectMonitor(HwDeviceExtension); */
|
||||
pVBInfo->IF_DEF_CH7007 = 0;
|
||||
if ((HwDeviceExtension->jChipType == XG21) && (pVBInfo->IF_DEF_CH7007)) {
|
||||
printk("184");
|
||||
XGI_GetSenseStatus(HwDeviceExtension, pVBInfo); /* sense CRT2 */
|
||||
printk("185");
|
||||
printk("183");
|
||||
/* XGINew_DetectMonitor(HwDeviceExtension); */
|
||||
pVBInfo->IF_DEF_CH7007 = 0;
|
||||
if ((HwDeviceExtension->jChipType == XG21) && (pVBInfo->IF_DEF_CH7007)) {
|
||||
printk("184");
|
||||
XGI_GetSenseStatus(HwDeviceExtension, pVBInfo); /* sense CRT2 */
|
||||
printk("185");
|
||||
|
||||
}
|
||||
if (HwDeviceExtension->jChipType == XG21) {
|
||||
printk("186");
|
||||
}
|
||||
if (HwDeviceExtension->jChipType == XG21) {
|
||||
printk("186");
|
||||
|
||||
XGINew_SetRegANDOR(pVBInfo->P3d4, 0x32, ~Monitor1Sense, Monitor1Sense); /* Z9 default has CRT */
|
||||
temp = GetXG21FPBits(pVBInfo);
|
||||
XGINew_SetRegANDOR(pVBInfo->P3d4, 0x37, ~0x01, temp);
|
||||
printk("187");
|
||||
XGINew_SetRegANDOR(pVBInfo->P3d4, 0x32, ~Monitor1Sense, Monitor1Sense); /* Z9 default has CRT */
|
||||
temp = GetXG21FPBits(pVBInfo);
|
||||
XGINew_SetRegANDOR(pVBInfo->P3d4, 0x37, ~0x01, temp);
|
||||
printk("187");
|
||||
|
||||
}
|
||||
if (HwDeviceExtension->jChipType == XG27) {
|
||||
XGINew_SetRegANDOR(pVBInfo->P3d4, 0x32, ~Monitor1Sense, Monitor1Sense); /* Z9 default has CRT */
|
||||
temp = GetXG27FPBits(pVBInfo);
|
||||
XGINew_SetRegANDOR(pVBInfo->P3d4, 0x37, ~0x03, temp);
|
||||
}
|
||||
}
|
||||
if (HwDeviceExtension->jChipType == XG27) {
|
||||
XGINew_SetRegANDOR(pVBInfo->P3d4, 0x32, ~Monitor1Sense, Monitor1Sense); /* Z9 default has CRT */
|
||||
temp = GetXG27FPBits(pVBInfo);
|
||||
XGINew_SetRegANDOR(pVBInfo->P3d4, 0x37, ~0x03, temp);
|
||||
}
|
||||
printk("19");
|
||||
|
||||
|
|
|
@ -82,8 +82,6 @@ struct xgi_hw_device_info
|
|||
|
||||
unsigned char bIntegratedMMEnabled;/* supporting integration MM enable */
|
||||
|
||||
unsigned char bSkipSense;
|
||||
|
||||
unsigned char(*pQueryVGAConfigSpace)(struct xgi_hw_device_info *,
|
||||
unsigned long, unsigned long,
|
||||
unsigned long *);
|
||||
|
|
Loading…
Reference in a new issue