1088N/Adiff -Nurp -x '*~' -x '*.orig' exa/exa.c exa/exa.c

1088N/A--- exa/exa.c 2010-07-14 13:23:17.000000000 -0700

1088N/A+++ exa/exa.c 2010-09-03 16:45:44.147202216 -0700

1088N/A@@ -61,7 +61,11 @@ exaGetPixmapOffset(PixmapPtr pPix)

881N/A ExaScreenPriv (pPix->drawable.pScreen);

881N/A ExaPixmapPriv (pPix);

881N/A

881N/A- return (CARD8 *)pExaPixmap->fb_ptr - pExaScr->info->memoryBase;

881N/A+ /* added in as a fix for 6912996 */

1088N/A+ if (exaPixmapHasGpuCopy(pExaPixmap) && pExaPixmap->fb_ptr)

881N/A+ return (CARD8 *)pExaPixmap->fb_ptr - pExaScr->info->memoryBase;

881N/A+ else

881N/A+ return (CARD8 *)pExaPixmap->sys_ptr - pExaScr->info->memoryBase;

881N/A }

881N/A

881N/A void *