qbit/xenocara
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

MFC: Guard references to PCITAG / pciTag with XSERVER_LIBPCIACCESS

Browse Source 
fixes the radeonold driver with xserver 1.12.
This commit is contained in:
matthieu 2012-06-07 21:07:05 +00:00
parent 8d622ccd32
commit 53c868dbb5
2 changed files with 4 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
driver/xf86-video-radeonold/src/radeon.h
View File

@ -699,7 +699,9 @@ struct radeon_accel_state {
typedef struct { typedef struct {
EntityInfoPtr pEnt; EntityInfoPtr pEnt;
pciVideoPtr PciInfo; pciVideoPtr PciInfo;
#ifndef XSERVER_LIBPCIACCESS
PCITAG PciTag; PCITAG PciTag;
#endif
int Chipset; int Chipset;
RADEONChipFamily ChipFamily; RADEONChipFamily ChipFamily;
RADEONErrata ChipErrata; RADEONErrata ChipErrata;

2
driver/xf86-video-radeonold/src/radeon_driver.c
View File

@ -2836,9 +2836,11 @@ Bool RADEONPreInit(ScrnInfoPtr pScrn, int flags)
} }
info->PciInfo = xf86GetPciInfoForEntity(info->pEnt->index); info->PciInfo = xf86GetPciInfoForEntity(info->pEnt->index);
#ifndef XSERVER_LIBPCIACCESS
info->PciTag = pciTag(PCI_DEV_BUS(info->PciInfo), info->PciTag = pciTag(PCI_DEV_BUS(info->PciInfo),
PCI_DEV_DEV(info->PciInfo), PCI_DEV_DEV(info->PciInfo),
PCI_DEV_FUNC(info->PciInfo)); PCI_DEV_FUNC(info->PciInfo));
#endif
info->MMIOAddr = PCI_REGION_BASE(info->PciInfo, 2, REGION_MEM) & ~0xffULL; info->MMIOAddr = PCI_REGION_BASE(info->PciInfo, 2, REGION_MEM) & ~0xffULL;
info->MMIOSize = PCI_REGION_SIZE(info->PciInfo, 2); info->MMIOSize = PCI_REGION_SIZE(info->PciInfo, 2);
xf86DrvMsg(pScrn->scrnIndex, X_INFO, "TOTO SAYS %016llx\n", xf86DrvMsg(pScrn->scrnIndex, X_INFO, "TOTO SAYS %016llx\n",