components/x11/xorg-server/patches/21-6912996.patch

   1 diff --git a/exa/exa.c b/exa/exa.c
   2 index d12344f..ba82382 100644
   3 --- a/exa/exa.c
   4 +++ b/exa/exa.c
   5 @@ -59,7 +59,11 @@ exaGetPixmapOffset(PixmapPtr pPix)
   6      ExaScreenPriv(pPix->drawable.pScreen);
   7      ExaPixmapPriv(pPix);
   8
   9 -    return (CARD8 *) pExaPixmap->fb_ptr - pExaScr->info->memoryBase;
  10 +    /* added in as a fix for 6912996 */
  11 +    if (exaPixmapHasGpuCopy(pPix) && pExaPixmap->fb_ptr)
  12 +        return (CARD8 *) pExaPixmap->fb_ptr - pExaScr->info->memoryBase;
  13 +    else
  14 +        return (CARD8 *) pExaPixmap->sys_ptr - pExaScr->info->memoryBase;
  15  }
  16
  17  void *