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

Prepare for xserver 1.17

Browse Source
This commit is contained in:
matthieu 2015-08-23 17:40:49 +00:00
parent ecf67af775
commit f3bbc4bb2c
2 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
driver/xf86-video-r128/src/r128.h
View File

@ -301,7 +301,9 @@ struct r128_2d_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;
Bool Primary; Bool Primary;

6
driver/xf86-video-r128/src/r128_driver.c
View File

@ -1955,9 +1955,6 @@ Bool R128PreInit(ScrnInfoPtr pScrn, int flags)
} }
info->PciInfo = xf86GetPciInfoForEntity(info->pEnt->index); 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, xf86DrvMsg(pScrn->scrnIndex, X_INFO,
"PCI bus %d card %d func %d\n", "PCI bus %d card %d func %d\n",
@ -1966,6 +1963,9 @@ Bool R128PreInit(ScrnInfoPtr pScrn, int flags)
PCI_DEV_FUNC(info->PciInfo)); PCI_DEV_FUNC(info->PciInfo));
#ifndef XSERVER_LIBPCIACCESS #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 (xf86RegisterResources(info->pEnt->index, 0, ResNone)) goto fail;
if (xf86SetOperatingState(resVga, info->pEnt->index, ResUnusedOpr)) goto fail; if (xf86SetOperatingState(resVga, info->pEnt->index, ResUnusedOpr)) goto fail;