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

[Chris Wilson]

 src/sna/sna_accel.c |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit 8bbfa88a8691f6c1b2903090c3cd3159126ef563
Author: Chris Wilson <chris at chris-wilson.co.uk>
Date:   Tue Oct 9 17:26:39 2012 +0100

    sna: Also check the bg rrop for reads when deciding upon fallback placement
    
    Reported-and-tested-by: chr.ohm at gmx.net
    Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=55810
    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 3d8392f..3973c9d 100644
--- a/src/sna/sna_accel.c
+++ b/src/sna/sna_accel.c
@@ -2338,7 +2338,7 @@ drawable_gc_flags(DrawablePtr draw, GCPtr gc, bool partial)
 		return MOVE_READ | MOVE_WRITE;
 	}
 
-	if (fb_gc(gc)->and) {
+	if (fb_gc(gc)->and | fb_gc(gc)->bgand) {
 		DBG(("%s: read due to rrop %d:%x\n",
 		     __FUNCTION__, gc->alu, (unsigned)fb_gc(gc)->and));
 		return MOVE_READ | MOVE_WRITE;
commit f8a005d1f984382272ad10cabd88c0422d4e76e8
Author: Chris Wilson <chris at chris-wilson.co.uk>
Date:   Tue Oct 9 00:23:24 2012 +0100

    sna: Pass the region, not its pointer, when moving the GC to the CPU
    
    Fortunately, the sgc->region was not used along that particular fallback
    path.
    
    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 862b296..3d8392f 100644
--- a/src/sna/sna_accel.c
+++ b/src/sna/sna_accel.c
@@ -5011,7 +5011,7 @@ sna_fallback_copy_boxes(DrawablePtr src, DrawablePtr dst, GCPtr gc,
 	     region->extents.x2, region->extents.y2,
 	     dx, dy, gc->alu));
 
-	if (!sna_gc_move_to_cpu(gc, dst, &region))
+	if (!sna_gc_move_to_cpu(gc, dst, region))
 		return;
 
 	if (src == dst ||