diff options
| author | Martin-Éric Racine <martin-eric.racine@iki.fi> | 2011-03-13 19:15:50 +0200 |
|---|---|---|
| committer | Martin-Éric Racine <martin-eric.racine@iki.fi> | 2011-03-13 19:15:50 +0200 |
| commit | 5b7c850acc09d91331e872b783f2b8d7835336f0 (patch) | |
| tree | 8034f9b7b79b30788047918b511fbbd7285830bf | |
| parent | 1fd4cebad38d66b1bf1b90232307f78abe852fe4 (diff) | |
Fixing the resource transition some more.
| -rw-r--r-- | src/nsc_gx1_driver.c | 4 | ||||
| -rw-r--r-- | src/nsc_gx2_driver.c | 4 |
2 files changed, 8 insertions, 0 deletions
diff --git a/src/nsc_gx1_driver.c b/src/nsc_gx1_driver.c index 0ebd5d1..2df7f40 100644 --- a/src/nsc_gx1_driver.c +++ b/src/nsc_gx1_driver.c @@ -480,8 +480,10 @@ GX1PreInit(ScrnInfoPtr pScreenInfo, int flags) /* This is the general case */ for (i = 0; i < pScreenInfo->numEntities; i++) { pGeode->pEnt = xf86GetEntityInfo(pScreenInfo->entityList[i]); + #ifndef XSERVER_LIBPCIACCESS if (pGeode->pEnt->resources) return FALSE; + #endif pGeode->Chipset = pGeode->pEnt->chipset; pScreenInfo->chipset = (char *)xf86TokenToString(GeodeChipsets, pGeode->pEnt->chipset); @@ -1035,12 +1037,14 @@ GX1PreInit(ScrnInfoPtr pScreenInfo, int flags) xf86LoaderReqSymLists(nscShadowSymbols, NULL); } GeodeDebug(("GX2PreInit(18)!\n")); + #ifndef XSERVER_LIBPCIACCESS if (xf86RegisterResources(pGeode->pEnt->index, NULL, ResExclusive)) { DEBUGMSG(1, (pScreenInfo->scrnIndex, X_ERROR, "xf86RegisterResources() found resource conflicts\n")); GX1FreeRec(pScreenInfo); return FALSE; } + #endif GX1UnmapMem(pScreenInfo); GeodeDebug(("GX1PreInit(19)!\n")); GeodeDebug(("GX1PreInit(20)!\n")); diff --git a/src/nsc_gx2_driver.c b/src/nsc_gx2_driver.c index 5ccd60f..06da713 100644 --- a/src/nsc_gx2_driver.c +++ b/src/nsc_gx2_driver.c @@ -487,8 +487,10 @@ GX2PreInit(ScrnInfoPtr pScreenInfo, int flags) /* This is the general case */ for (i = 0; i < pScreenInfo->numEntities; i++) { pGeode->pEnt = xf86GetEntityInfo(pScreenInfo->entityList[i]); + #ifndef XSERVER_LIBPCIACCESS if (pGeode->pEnt->resources) return FALSE; + #endif pGeode->Chipset = pGeode->pEnt->chipset; pScreenInfo->chipset = (char *)xf86TokenToString(GeodeChipsets, pGeode->pEnt->chipset); @@ -997,12 +999,14 @@ GX2PreInit(ScrnInfoPtr pScreenInfo, int flags) xf86LoaderReqSymLists(nscShadowSymbols, NULL); } GeodeDebug(("GX2PreInit(18)!\n")); + #ifndef XSERVER_LIBPCIACCESS if (xf86RegisterResources(pGeode->pEnt->index, NULL, ResExclusive)) { DEBUGMSG(1, (pScreenInfo->scrnIndex, X_ERROR, "xf86RegisterResources() found resource conflicts\n")); GX2FreeRec(pScreenInfo); return FALSE; } + #endif GX2UnmapMem(pScreenInfo); GeodeDebug(("GX2PreInit ... done successfully!\n")); (void) from; |