diff options
| author | Dave Airlie <airlied@gmail.com> | 2014-09-20 18:51:17 +1000 |
|---|---|---|
| committer | Dave Airlie <airlied@gmail.com> | 2014-09-20 18:51:17 +1000 |
| commit | df389885adf71ed3b045c2fde9fd3ba4329e1a58 (patch) | |
| tree | da5ba7d11fbc512b9c5ce0041eb6eb36dd239919 | |
| parent | f0d278b48a659d4811f5494bf7de4a84e9c5880f (diff) | |
| download | xorg-driver-xf86-video-cirrus-df389885adf71ed3b045c2fde9fd3ba4329e1a58.tar.gz | |
cirrus: don't use pciTag
Signed-off-by: Dave Airlie <airlied@redhat.com>
| -rw-r--r-- | src/alp_driver.c | 2 | ||||
| -rw-r--r-- | src/cir.h | 2 | ||||
| -rw-r--r-- | src/lg_driver.c | 2 |
3 files changed, 6 insertions, 0 deletions
diff --git a/src/alp_driver.c b/src/alp_driver.c index 36f2039..bd5e52f 100644 --- a/src/alp_driver.c +++ b/src/alp_driver.c @@ -519,9 +519,11 @@ AlpPreInit(ScrnInfoPtr pScrn, int flags) pCir->Chipset = pCir->pEnt->chipset; /* Find the PCI info for this screen */ pCir->PciInfo = xf86GetPciInfoForEntity(pCir->pEnt->index); +#ifndef XSERVER_LIBPCIACCESS pCir->PciTag = pciTag(PCI_DEV_BUS(pCir->PciInfo), PCI_DEV_DEV(pCir->PciInfo), PCI_DEV_FUNC(pCir->PciInfo)); +#endif #if GET_ABI_MAJOR(ABI_VIDEODRV_VERSION) < 12 if (!xf86IsPc98()) @@ -23,7 +23,9 @@ typedef struct { ScrnInfoPtr pScrn; CARD32 properties; pciVideoPtr PciInfo; +#ifndef XSERVER_LIBPCIACCESS PCITAG PciTag; +#endif unsigned long PIOReg; union { struct lgRec *lg; diff --git a/src/lg_driver.c b/src/lg_driver.c index c20bbd0..589d14e 100644 --- a/src/lg_driver.c +++ b/src/lg_driver.c @@ -382,9 +382,11 @@ LgPreInit(ScrnInfoPtr pScrn, int flags) /* Find the PCI info for this screen */ pCir->PciInfo = xf86GetPciInfoForEntity(pCir->pEnt->index); +#ifndef XSERVER_LIBPCIACCESS pCir->PciTag = pciTag(PCI_DEV_BUS(pCir->PciInfo), PCI_DEV_DEV(pCir->PciInfo), PCI_DEV_FUNC(pCir->PciInfo)); +#endif if (xf86LoadSubModule(pScrn, "int10")) { xf86Int10InfoPtr int10InfoPtr; |