diff options
| author | Matthieu Herrb <matthieu@cvs.openbsd.org> | 2015-08-23 17:40:50 +0000 |
|---|---|---|
| committer | Matthieu Herrb <matthieu@cvs.openbsd.org> | 2015-08-23 17:40:50 +0000 |
| commit | ee67b35b3de37f1851735d1bce03d226936e69cf (patch) | |
| tree | 7c7dfe4aa44fcc9d36239787ca1b45c916b1c849 /driver/xf86-video-r128 | |
| parent | c7e038a2a9eaca712b7146527cea533bb6c2f6b4 (diff) | |
Prepare for xserver 1.17
Diffstat (limited to 'driver/xf86-video-r128')
| -rw-r--r-- | driver/xf86-video-r128/src/r128.h | 2 | ||||
| -rw-r--r-- | driver/xf86-video-r128/src/r128_driver.c | 6 |
2 files changed, 5 insertions, 3 deletions
diff --git a/driver/xf86-video-r128/src/r128.h b/driver/xf86-video-r128/src/r128.h index 9c0ecb640..fdf2f2b5a 100644 --- a/driver/xf86-video-r128/src/r128.h +++ b/driver/xf86-video-r128/src/r128.h @@ -301,7 +301,9 @@ struct r128_2d_state { typedef struct { EntityInfoPtr pEnt; pciVideoPtr PciInfo; +#ifndef XSERVER_LIBPCIACCESS PCITAG PciTag; +#endif int Chipset; Bool Primary; diff --git a/driver/xf86-video-r128/src/r128_driver.c b/driver/xf86-video-r128/src/r128_driver.c index cc7a5fbd3..053a2456a 100644 --- a/driver/xf86-video-r128/src/r128_driver.c +++ b/driver/xf86-video-r128/src/r128_driver.c @@ -1955,9 +1955,6 @@ Bool R128PreInit(ScrnInfoPtr pScrn, int flags) } info->PciInfo = xf86GetPciInfoForEntity(info->pEnt->index); - info->PciTag = pciTag(PCI_DEV_BUS(info->PciInfo), - PCI_DEV_DEV(info->PciInfo), - PCI_DEV_FUNC(info->PciInfo)); xf86DrvMsg(pScrn->scrnIndex, X_INFO, "PCI bus %d card %d func %d\n", @@ -1966,6 +1963,9 @@ Bool R128PreInit(ScrnInfoPtr pScrn, int flags) PCI_DEV_FUNC(info->PciInfo)); #ifndef XSERVER_LIBPCIACCESS + info->PciTag = pciTag(PCI_DEV_BUS(info->PciInfo), + PCI_DEV_DEV(info->PciInfo), + PCI_DEV_FUNC(info->PciInfo)); if (xf86RegisterResources(info->pEnt->index, 0, ResNone)) goto fail; if (xf86SetOperatingState(resVga, info->pEnt->index, ResUnusedOpr)) goto fail; |