XLibre/xf86-video-cirrus
1
0
Fork 0
mirror of https://github.com/X11Libre/xf86-video-cirrus.git synced 2026-03-24 01:24:45 +00:00
Code Issues Packages Projects Releases Wiki Activity

Build fix for ABI Version 12

Browse Source 
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>
This commit is contained in:
Jeremy Huddleston
2011-10-19 00:12:15 -07:00
parent 80f60e4af0
commit 9fcfd1aa76
3 changed files with 11 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/alp_driver.c
View File

@@ -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]);

2
src/cir.h
View File

@@ -21,7 +21,7 @@ typedef struct {
CARD32 properties;
pciVideoPtr PciInfo;
PCITAG PciTag;
IOADDRESS PIOReg;
unsigned long PIOReg;
union {
struct lgRec *lg;
struct alpRec *alp;

5
src/lg_driver.c
View File

@@ -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]);