diff options
| author | George Sapountzis <gsap7@yahoo.gr> | 2006-12-28 14:46:10 +0200 |
|---|---|---|
| committer | George Sapountzis <gsap7@yahoo.gr> | 2007-01-28 01:24:23 +0200 |
| commit | 8b7c88e9ed549777413136c0f2ccc61747b010d8 (patch) | |
| tree | 198d1b17426d5884c1dfee4976ed261084b6687d /src/atiprobe.c | |
| parent | 3654b786f1ad1f4e6bfb2fff5ff057254958f7c0 (diff) | |
Add option "probe_sparse" to force probing sparse I/O bases.
Diffstat (limited to 'src/atiprobe.c')
| -rw-r--r-- | src/atiprobe.c | 24 |
1 files changed, 24 insertions, 0 deletions
diff --git a/src/atiprobe.c b/src/atiprobe.c index 1cd62bdf..e869bf0d 100644 --- a/src/atiprobe.c +++ b/src/atiprobe.c @@ -67,6 +67,18 @@ ATIVGAWonderProbe { CARD8 IOValue1, IOValue2, IOValue3, IOValue4, IOValue5, IOValue6; + if (!pATI->OptionProbeSparse) + { + xf86Msg(X_WARNING, + ATI_NAME ": Expected VGA Wonder capability at I/O port" + " 0x%04lX will not be probed\n" + "set option \"probe_sparse\" to force probing.\n", + pATI->CPIO_VGAWonder); + + pATI->CPIO_VGAWonder = 0; + return; + } + if (pVideo && !xf86IsPrimaryPci(pVideo) && (pATI->Chip <= ATI_CHIP_88800GXD)) { @@ -414,7 +426,19 @@ ATIMach64ProbeIO * build a list of registered I/O ports. If there was a conflict * between a mach64 sparse I/O base and a registered I/0 port, probing * that port was not allowed... + * + * We just add an option and let the user decide, this will not work + * with "X -configure" though... */ + if (!pATI->OptionProbeSparse) + { + xf86Msg(X_WARNING, ATI_NAME ": " + "PCI Mach64 in slot %d:%d:%d will not be probed\n" + "set option \"probe_sparse\" to force sparse I/O probing.\n", + pVideo->bus, pVideo->device, pVideo->func); + + goto SkipSparse; + } /* Possibly fix block I/O indicator */ if (PciReg & 0x00000004U) |