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

1494N/Aindex 754c830..714b6b7 100644

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

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

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

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

1494N/A ExaPixmapPriv(pPix);

1494N/A

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

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

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

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

1494N/A+ else

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

1494N/A }

1494N/A

1494N/A void *

1494N/A