xserver: Branch 'master'

[Michel Dänzer]

 exa/exa_accel.c |    1 +
 1 file changed, 1 insertion(+)

New commits:
commit d3ad1804a5216487b5837a80f3e53b81212dcf84
Author: Michel Dänzer <daenzer at vmware.com>
Date:   Tue Sep 8 15:25:19 2009 +0200

    EXA: Only take special code path for 1x1 fill for pixmaps.
    
    It doesn't make sense for windows.
    
    Also double-check that the data pointer is valid.
    
    Fixes http://bugs.freedesktop.org/show_bug.cgi?id=23461 (not sure that could
    happen on master even without this, but just in case)

diff --git a/exa/exa_accel.c b/exa/exa_accel.c
index 33fbb98..7e2dd70 100644
--- a/exa/exa_accel.c
+++ b/exa/exa_accel.c
@@ -1018,6 +1018,7 @@ exaFillRegionSolid (DrawablePtr	pDrawable, RegionPtr pRegion, Pixel pixel,
 	exaMarkSync(pDrawable->pScreen);
 
 	if (pExaPixmap->pDamage &&
+	    pExaPixmap->sys_ptr && pDrawable->type == DRAWABLE_PIXMAP &&
 	    pDrawable->width == 1 && pDrawable->height == 1 &&
 	    pDrawable->bitsPerPixel != 24) {
 	    ExaPixmapPriv(pPixmap);