diff options
Diffstat (limited to 'drivers')
-rw-r--r-- | drivers/staging/xgifb/XGI_main.h | 2 | ||||
-rw-r--r-- | drivers/staging/xgifb/XGI_main_26.c | 27 |
2 files changed, 0 insertions, 29 deletions
diff --git a/drivers/staging/xgifb/XGI_main.h b/drivers/staging/xgifb/XGI_main.h index b27623a1578..a014405cb44 100644 --- a/drivers/staging/xgifb/XGI_main.h +++ b/drivers/staging/xgifb/XGI_main.h | |||
@@ -9,8 +9,6 @@ | |||
9 | #include "vb_struct.h" | 9 | #include "vb_struct.h" |
10 | #include "vb_def.h" | 10 | #include "vb_def.h" |
11 | 11 | ||
12 | //#define LINUXBIOS /* turn this on when compiling for LINUXBIOS */ | ||
13 | |||
14 | #define XGIFAIL(x) do { printk(x "\n"); return -EINVAL; } while(0) | 12 | #define XGIFAIL(x) do { printk(x "\n"); return -EINVAL; } while(0) |
15 | 13 | ||
16 | #define VER_MAJOR 0 | 14 | #define VER_MAJOR 0 |
diff --git a/drivers/staging/xgifb/XGI_main_26.c b/drivers/staging/xgifb/XGI_main_26.c index ed0d554d595..79ff4df36a8 100644 --- a/drivers/staging/xgifb/XGI_main_26.c +++ b/drivers/staging/xgifb/XGI_main_26.c | |||
@@ -2265,34 +2265,10 @@ static int __devinit xgifb_probe(struct pci_dev *pdev, | |||
2265 | /* Mapping Max FB Size for 315 Init */ | 2265 | /* Mapping Max FB Size for 315 Init */ |
2266 | XGIhw_ext.pjVideoMemoryAddress = ioremap(xgi_video_info.video_base, 0x10000000); | 2266 | XGIhw_ext.pjVideoMemoryAddress = ioremap(xgi_video_info.video_base, 0x10000000); |
2267 | if ((xgifb_mode_idx < 0) || ((XGIbios_mode[xgifb_mode_idx].mode_no) != 0xFF)) { | 2267 | if ((xgifb_mode_idx < 0) || ((XGIbios_mode[xgifb_mode_idx].mode_no) != 0xFF)) { |
2268 | #ifdef LINUXBIOS | ||
2269 | printk("XGIfb: XGIInit() ..."); | ||
2270 | /* XGIInitNewt for LINUXBIOS only */ | ||
2271 | if (XGIInitNew(&XGIhw_ext)) | ||
2272 | printk("OK\n"); | ||
2273 | else | ||
2274 | printk("Fail\n"); | ||
2275 | #endif | ||
2276 | |||
2277 | outXGIIDXREG(XGISR, IND_XGI_PASSWORD, XGI_PASSWORD); | 2268 | outXGIIDXREG(XGISR, IND_XGI_PASSWORD, XGI_PASSWORD); |
2278 | 2269 | ||
2279 | } | 2270 | } |
2280 | } | 2271 | } |
2281 | #ifdef LINUXBIOS | ||
2282 | else { | ||
2283 | XGIhw_ext.pjVideoMemoryAddress = ioremap(xgi_video_info.video_base, 0x10000000); | ||
2284 | if ((xgifb_mode_idx < 0) || ((XGIbios_mode[xgifb_mode_idx].mode_no) != 0xFF)) { | ||
2285 | |||
2286 | outXGIIDXREG(XGISR, IND_XGI_PASSWORD, XGI_PASSWORD); | ||
2287 | |||
2288 | /* yilin Because no VBIOS DRAM Sizing, Dram size will error. */ | ||
2289 | /* Set SR13 ,14 temporarily for UDtech */ | ||
2290 | outXGIIDXREG(XGISR, 0x13, 0x45); | ||
2291 | outXGIIDXREG(XGISR, 0x14, 0x51); | ||
2292 | |||
2293 | } | ||
2294 | } | ||
2295 | #endif | ||
2296 | if (XGIfb_get_dram_size()) { | 2272 | if (XGIfb_get_dram_size()) { |
2297 | printk(KERN_INFO "XGIfb: Fatal error: Unable to determine RAM size.\n"); | 2273 | printk(KERN_INFO "XGIfb: Fatal error: Unable to determine RAM size.\n"); |
2298 | ret = -ENODEV; | 2274 | ret = -ENODEV; |
@@ -2459,7 +2435,6 @@ static int __devinit xgifb_probe(struct pci_dev *pdev, | |||
2459 | XGIfb_detectedpdc = 0; | 2435 | XGIfb_detectedpdc = 0; |
2460 | 2436 | ||
2461 | XGIfb_detectedlcda = 0xff; | 2437 | XGIfb_detectedlcda = 0xff; |
2462 | #ifndef LINUXBIOS | ||
2463 | 2438 | ||
2464 | /* TW: Try to find about LCDA */ | 2439 | /* TW: Try to find about LCDA */ |
2465 | 2440 | ||
@@ -2492,8 +2467,6 @@ static int __devinit xgifb_probe(struct pci_dev *pdev, | |||
2492 | 2467 | ||
2493 | } | 2468 | } |
2494 | 2469 | ||
2495 | #endif | ||
2496 | |||
2497 | if (xgifb_mode_idx >= 0) | 2470 | if (xgifb_mode_idx >= 0) |
2498 | xgifb_mode_idx = XGIfb_validate_mode(xgifb_mode_idx); | 2471 | xgifb_mode_idx = XGIfb_validate_mode(xgifb_mode_idx); |
2499 | 2472 | ||