summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--src/alp_driver.c5
-rw-r--r--src/cir.h2
-rw-r--r--src/lg_driver.c5
3 files changed, 11 insertions, 1 deletions
diff --git a/src/alp_driver.c b/src/alp_driver.c
index edcaef3..e773471 100644
--- a/src/alp_driver.c
+++ b/src/alp_driver.c
@@ -480,7 +480,12 @@ AlpPreInit(ScrnInfoPtr pScrn, int flags)
pCir = CIRPTR(pScrn);
pCir->pScrn = pScrn;
+
+#if GET_ABI_MAJOR(ABI_VIDEODRV_VERSION) < 12
pCir->PIOReg = hwp->PIOOffset + 0x3CE;
+#else
+ pCir->PIOReg = 0x3CE;
+#endif
/* Get the entity, and make sure it is PCI. */
pCir->pEnt = xf86GetEntityInfo(pScrn->entityList[0]);
diff --git a/src/cir.h b/src/cir.h
index 64531f5..861966d 100644
--- a/src/cir.h
+++ b/src/cir.h
@@ -21,7 +21,7 @@ typedef struct {
CARD32 properties;
pciVideoPtr PciInfo;
PCITAG PciTag;
- IOADDRESS PIOReg;
+ unsigned long PIOReg;
union {
struct lgRec *lg;
struct alpRec *alp;
diff --git a/src/lg_driver.c b/src/lg_driver.c
index 0f9f1f6..fc864f8 100644
--- a/src/lg_driver.c
+++ b/src/lg_driver.c
@@ -372,7 +372,12 @@ LgPreInit(ScrnInfoPtr pScrn, int flags)
pCir = CIRPTR(pScrn);
pCir->pScrn = pScrn;
+
+#if GET_ABI_MAJOR(ABI_VIDEODRV_VERSION) < 12
pCir->PIOReg = hwp->PIOOffset + 0x3CE;
+#else
+ pCir->PIOReg = 0x3CE;
+#endif
/* Get the entity, and make sure it is PCI. */
pCir->pEnt = xf86GetEntityInfo(pScrn->entityList[0]);