xf86-video-r128: Branch 'master'
Alex Deucher
agd5f at kemper.freedesktop.org
Fri Apr 17 13:18:00 PDT 2009
src/r128_driver.c | 10 ++++++++++
1 file changed, 10 insertions(+)
New commits:
commit 771c707eb2bba21b6013327bb62859c37be08673
Author: John Nielsen <lists at jnielsen.net>
Date: Fri Apr 17 16:16:57 2009 -0400
R128: fix zaphod dualhead after libpciaccess switch
fixes bug 21251
diff --git a/src/r128_driver.c b/src/r128_driver.c
index 8f360a1..e3d7bb3 100644
--- a/src/r128_driver.c
+++ b/src/r128_driver.c
@@ -234,6 +234,16 @@ static Bool R128MapMMIO(ScrnInfoPtr pScrn)
if (info->FBDev) {
info->MMIO = fbdevHWMapMMIO(pScrn);
} else {
+ /* If the primary screen has already mapped the MMIO region,
+ use its pointer instead of mapping it a second time. */
+ if (info->IsSecondary) {
+ DevUnion* pPriv = xf86GetEntityPrivate(pScrn->entityList[0],
+ getR128EntityIndex());
+ R128EntPtr pR128Ent = pPriv->ptr;
+ R128InfoPtr info0 = R128PTR(pR128Ent->pPrimaryScrn);
+ info->MMIO=info0->MMIO;
+ if (info->MMIO) return TRUE;
+ }
#ifndef XSERVER_LIBPCIACCESS
info->MMIO = xf86MapPciMem(pScrn->scrnIndex,
VIDMEM_MMIO | VIDMEM_READSIDEEFFECT,
More information about the xorg-commit
mailing list