diff options
| author | Jeremy Huddleston <jeremyhu@apple.com> | 2011-10-19 00:24:00 -0700 |
|---|---|---|
| committer | Jeremy Huddleston <jeremyhu@apple.com> | 2011-10-19 00:24:00 -0700 |
| commit | 0e357623bc3d68e6eaf9bb755f44cca2d5321f8b (patch) | |
| tree | a30e095d61f63eda63661d516ba1aa00e4019349 | |
| parent | c3eb2c3f05902be4e4e5b929663753276cde3611 (diff) | |
Build fix for ABI Version 12
ABI Version 12 removes support for multiple PCI domains. If you need to
use this driver on a system with more than one PCI domain, you should
either port this driver to using libpciaccess directly or stick with an
older server.
Signed-off-by: Jeremy Huddleston <jeremyhu@apple.com>
| -rw-r--r-- | src/i128_driver.c | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/src/i128_driver.c b/src/i128_driver.c index 26c06df..92f9d58 100644 --- a/src/i128_driver.c +++ b/src/i128_driver.c @@ -650,7 +650,10 @@ I128PreInit(ScrnInfoPtr pScrn, int flags) xf86DrvMsg(pScrn->scrnIndex, from, "Subsystem Vendor: \"%x\"\n", PCI_SUB_VENDOR_ID(pI128->PciInfo)); - iobase = (PCI_REGION_BASE(pI128->PciInfo, 5, REGION_IO) & 0xFFFFFF00) + hwp->PIOOffset; + iobase = (PCI_REGION_BASE(pI128->PciInfo, 5, REGION_IO) & 0xFFFFFF00); +#if GET_ABI_MAJOR(ABI_VIDEODRV_VERSION) < 12 + iobase += hwp->PIOOffset; +#endif pI128->RegRec.iobase = iobase; pI128->io.rbase_g = inl(iobase) & 0xFFFFFF00; |