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

[Chris Wilson]

 src/sna/sna_accel.c |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 2e2c448a77ab9dce4807b159708290cd7ad26b5c
Author: Chris Wilson <chris at chris-wilson.co.uk>
Date:   Tue Jun 25 14:22:28 2013 +0100

    sna: Don't flag IGNORE_CPU for partial overwritten blocks
    
    As we set the flags for the migration extents, but only operate upon the
    boxes in the region, we need to be careful to be sure to migrate data
    outside of the boxes overwritten.
    
    Fixes regression from
    commit 94cbe7bf7b7acc9a7f2cb56c5e275af028f3cdc8 [2.21.10]
    Author: Chris Wilson <chris at chris-wilson.co.uk>
    Date:   Thu Jun 20 19:40:44 2013 +0100
    
        sna: Mark overwriting CopyArea as not needing the dst damage
    
    If we start passing around regions rather than extents, we coud do
    finergrained migration decision.
    
    Reported-by: Clemens Eisserer <linuxhippy at gmail.com>
    Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=55244
    Signed-off-by: Chris Wilson <chris at chris-wilson.co.uk>

diff --git a/src/sna/sna_accel.c b/src/sna/sna_accel.c
index a3e4ed4..df34acd 100644
--- a/src/sna/sna_accel.c
+++ b/src/sna/sna_accel.c
@@ -4884,7 +4884,7 @@ sna_copy_boxes(DrawablePtr src, DrawablePtr dst, GCPtr gc,
 			dst_priv->cpu = false;
 		}
 	}
-	if (alu_overwrites(alu))
+	if (region->data == NULL && alu_overwrites(alu))
 		hint |= IGNORE_CPU;
 
 	/* XXX hack for firefox -- subsequent uses of src will be corrupt! */