upstream/oracle/x-cons/x-s12-clone: open-src/xserver/xorg/6912996.patch@7bc7e624f965

author	Alan Coopersmith <Alan.Coopersmith@Oracle.COM>
	Mon, 09 May 2011 14:58:28 -0700
changeset 1124	7bc7e624f965
parent 1088	1c99106ccbe0
child 1276	52f85727ce94
permissions	-rw-r--r--

7042476 Xorg 1.10 & associated module updates [PSARC/2011/214] PSARC/2011/213 X Synchronization Extension version 3.1 PSARC/2011/214 Xorg server 1.10


diff --git a/exa/exa.c b/exa/exa.c
index a4e294a..df29441 100644
--- a/exa/exa.c
+++ b/exa/exa.c
@@ -61,7 +61,11 @@ exaGetPixmapOffset(PixmapPtr pPix)
     ExaScreenPriv (pPix->drawable.pScreen);
     ExaPixmapPriv (pPix);
 
-    return (CARD8 *)pExaPixmap->fb_ptr - pExaScr->info->memoryBase;
+    /* added in as a fix for 6912996 */
+    if (exaPixmapHasGpuCopy(pExaPixmap) && pExaPixmap->fb_ptr)
+	return (CARD8 *)pExaPixmap->fb_ptr - pExaScr->info->memoryBase;
+    else
+	return (CARD8 *)pExaPixmap->sys_ptr - pExaScr->info->memoryBase;
 }
 
 void *