open-src/xserver/xorg/6912996.patch
author Alan Coopersmith <Alan.Coopersmith@Oracle.COM>
Mon, 14 Mar 2011 15:37:30 -0700
changeset 1088 1c99106ccbe0
parent 881 1a541f8ae0aa
child 1124 7bc7e624f965
permissions -rw-r--r--
6983602 Xorg 1.9 integration [PSARC/2011/008]

diff -Nurp -x '*~' -x '*.orig' exa/exa.c exa/exa.c
--- exa/exa.c	2010-07-14 13:23:17.000000000 -0700
+++ exa/exa.c	2010-09-03 16:45:44.147202216 -0700
@@ -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 *