1124N/Adiff --git a/exa/exa.c b/exa/exa.c

1340N/Aindex d12344f..ba82382 100644

1124N/A--- a/exa/exa.c

1124N/A+++ b/exa/exa.c

1340N/A@@ -59,7 +59,11 @@ exaGetPixmapOffset(PixmapPtr pPix)

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

1276N/A ExaPixmapPriv(pPix);

881N/A

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

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

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

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

881N/A+ else

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

881N/A }

881N/A

881N/A void *