From 8654ee514b4d79feec936501717a06892090d3b7 Mon Sep 17 00:00:00 2001
From: marha <marha@users.sourceforge.net>
Date: Thu, 15 Apr 2010 12:37:07 +0000
Subject: svn merge -r530:HEAD "^/branches/released" .

---
 xorg-server/exa/exa_accel.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'xorg-server/exa')

diff --git a/xorg-server/exa/exa_accel.c b/xorg-server/exa/exa_accel.c
index 00a97fdbf..4823398b5 100644
--- a/xorg-server/exa/exa_accel.c
+++ b/xorg-server/exa/exa_accel.c
@@ -512,7 +512,7 @@ exaHWCopyNtoN (DrawablePtr    pSrcDrawable,
 	 *
 	 * Only taking this path for directly accessible pixmaps.
 	 */
-	} else if (!pDstExaPixmap->pDamage) {
+	} else if (!pDstExaPixmap->pDamage && pSrcExaPixmap->sys_ptr) {
 	    int bpp = pSrcDrawable->bitsPerPixel;
 	    int src_stride = exaGetPixmapPitch(pSrcPixmap);
 	    CARD8 *src = NULL;
-- 
cgit v1.2.3