xf86-video-intel: src/sna/sna_composite.c

[Chris Wilson]

 src/sna/sna_composite.c |    1 +
 1 file changed, 1 insertion(+)

New commits:
commit de472d95affcad0f87685782d29a41fa2a0cada6
Author: Chris Wilson <chris at chris-wilson.co.uk>
Date:   Fri Jul 19 15:13:50 2013 +0100

    sna: Check for bpp>=8 before attempting to use memcpy_blt fastpath
    
    Fixes regression in
    commit 6921abd81017c9ed7f3b2413784068fbc609a0ea
    Author: Chris Wilson <chris at chris-wilson.co.uk>
    Date:   Thu Jul 18 16:21:27 2013 +0100
    
        sna: Add a fast path for the most common fallback for CPU-CPU blits
    
    Signed-off-by: Chris Wilson <chris at chris-wilson.co.uk>

diff --git a/src/sna/sna_composite.c b/src/sna/sna_composite.c
index d2152c7..3cd8269 100644
--- a/src/sna/sna_composite.c
+++ b/src/sna/sna_composite.c
@@ -522,6 +522,7 @@ sna_composite_fb(CARD8 op,
 
 	if (mask == NULL &&
 	    src->pDrawable &&
+	    dst->pDrawable->bitsPerPixel >= 8 &&
 	    src->filter != PictFilterConvolution &&
 	    (op == PictOpSrc || (op == PictOpOver && !PICT_FORMAT_A(src->format))) &&
 	    (dst->format == src->format || dst->format == alphaless(src->format)) &&