From 53c868dbb590981405395a12fe2384ed770624fa Mon Sep 17 00:00:00 2001 From: matthieu Date: Thu, 7 Jun 2012 21:07:05 +0000 Subject: [PATCH] MFC: Guard references to PCITAG / pciTag with XSERVER_LIBPCIACCESS fixes the radeonold driver with xserver 1.12. --- driver/xf86-video-radeonold/src/radeon.h | 2 ++ driver/xf86-video-radeonold/src/radeon_driver.c | 2 ++ 2 files changed, 4 insertions(+) diff --git a/driver/xf86-video-radeonold/src/radeon.h b/driver/xf86-video-radeonold/src/radeon.h index 23883fcfd..342cf1c57 100644 --- a/driver/xf86-video-radeonold/src/radeon.h +++ b/driver/xf86-video-radeonold/src/radeon.h @@ -699,7 +699,9 @@ struct radeon_accel_state { typedef struct { EntityInfoPtr pEnt; pciVideoPtr PciInfo; +#ifndef XSERVER_LIBPCIACCESS PCITAG PciTag; +#endif int Chipset; RADEONChipFamily ChipFamily; RADEONErrata ChipErrata; diff --git a/driver/xf86-video-radeonold/src/radeon_driver.c b/driver/xf86-video-radeonold/src/radeon_driver.c index 2bf88b4bc..6f186af23 100644 --- a/driver/xf86-video-radeonold/src/radeon_driver.c +++ b/driver/xf86-video-radeonold/src/radeon_driver.c @@ -2836,9 +2836,11 @@ Bool RADEONPreInit(ScrnInfoPtr pScrn, int flags) } info->PciInfo = xf86GetPciInfoForEntity(info->pEnt->index); +#ifndef XSERVER_LIBPCIACCESS info->PciTag = pciTag(PCI_DEV_BUS(info->PciInfo), PCI_DEV_DEV(info->PciInfo), PCI_DEV_FUNC(info->PciInfo)); +#endif info->MMIOAddr = PCI_REGION_BASE(info->PciInfo, 2, REGION_MEM) & ~0xffULL; info->MMIOSize = PCI_REGION_SIZE(info->PciInfo, 2); xf86DrvMsg(pScrn->scrnIndex, X_INFO, "TOTO SAYS %016llx\n",