881N/A--- exa/exa.c Tue Jan 12 15:07:10 2010

881N/A+++ exa/exa.c Tue Jan 12 15:10:44 2010

881N/A@@ -64,7 +64,11 @@

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 */

881N/A+ if (pExaPixmap->offscreen && 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 *