summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorAdam Jackson <ajax@redhat.com>2011-11-16 15:09:40 -0500
committerAdam Jackson <ajax@redhat.com>2011-11-16 15:09:40 -0500
commit4a7eda24050b42072c77d527257609e743e8dc78 (patch)
tree47edf3c7b564908c04210b7945ea18bcf4a043c7 /src
parent59d994f46218b5909725ce690cd3fef089a88ba5 (diff)
Adapt to domain changes in videoabi 12
This is a blind change, I don't have this hardware handy to test with. It probably wants the same new API that tdfx wants. Signed-off-by: Adam Jackson <ajax@redhat.com>
Diffstat (limited to 'src')
-rw-r--r--src/ast_driver.c11
1 files changed, 10 insertions, 1 deletions
diff --git a/src/ast_driver.c b/src/ast_driver.c
index bd3d338..128538f 100644
--- a/src/ast_driver.c
+++ b/src/ast_driver.c
@@ -498,11 +498,20 @@ ASTPreInit(ScrnInfoPtr pScrn, int flags)
(pScrn->chipset != NULL) ? pScrn->chipset : "Unknown ast");
/* Resource Allocation */
+#if ABI_VIDEODRV_VERSION < 12
pAST->IODBase = pScrn->domainIOBase;
+#else
+ pAST->IODBase = 0;
+#endif
/* "Patch" the PIOOffset inside vgaHW in order to force
* the vgaHW module to use our relocated i/o ports.
*/
- VGAHWPTR(pScrn)->PIOOffset = pAST->PIOOffset = pAST->IODBase + PCI_REGION_BASE(pAST->PciInfo, 2, REGION_IO) - 0x380;
+
+#if ABI_VIDEODRV_VERSION < 12
+ VGAHWPTR(pScrn)->PIOOffset = /* ... */
+#endif
+ pAST->PIOOffset =
+ pAST->IODBase + PCI_REGION_BASE(pAST->PciInfo, 2, REGION_IO) - 0x380;
pAST->RelocateIO = (IOADDRESS)(PCI_REGION_BASE(pAST->PciInfo, 2, REGION_IO) + pAST->IODBase);