56 lines
1.6 KiB
Diff
56 lines
1.6 KiB
Diff
From df389885adf71ed3b045c2fde9fd3ba4329e1a58 Mon Sep 17 00:00:00 2001
|
|
From: Dave Airlie <airlied@gmail.com>
|
|
Date: Sat, 20 Sep 2014 18:51:17 +1000
|
|
Subject: cirrus: don't use pciTag
|
|
|
|
Signed-off-by: Dave Airlie <airlied@redhat.com>
|
|
|
|
diff --git a/src/alp_driver.c b/src/alp_driver.c
|
|
index 36f2039..bd5e52f 100644
|
|
--- src/alp_driver.c
|
|
+++ 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())
|
|
diff --git a/src/cir.h b/src/cir.h
|
|
index 0a5d403..84f64b5 100644
|
|
--- src/cir.h
|
|
+++ src/cir.h
|
|
@@ -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
|
|
--- src/lg_driver.c
|
|
+++ 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;
|
|
--
|
|
cgit v0.10.2
|
|
|