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

[Chris Wilson]

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

New commits:
commit b796c33411218aeaf4daaeff41a1bc442b5f945f
Author: Chris Wilson <chris at chris-wilson.co.uk>
Date:   Wed Nov 6 16:24:28 2013 +0000

    sna: Always copy from the tile source
    
    The first step when tiling with an intermediatory is to copy from the
    source bo to the temporary. The alu should only be applied when copying
    from the temporary to the destination.
    
    Signed-off-by: Chris Wilson <chris at chris-wilson.co.uk>

diff --git a/src/sna/sna_tiling.c b/src/sna/sna_tiling.c
index c856939..6f0b96a 100644
--- a/src/sna/sna_tiling.c
+++ b/src/sna/sna_tiling.c
@@ -857,7 +857,7 @@ sna_tiling_blt_copy_boxes__with_alpha(struct sna *sna, uint8_t alu,
 				assert(bo->pitch <= 8192);
 				assert(bo->tiling != I915_TILING_Y);
 
-				if (!sna_blt_copy_boxes(sna, alu,
+				if (!sna_blt_copy_boxes(sna, GXcopy,
 							src_bo, src_dx, src_dy,
 							bo, -dx, -dy,
 							bpp, REGION_RECTS(&this), REGION_NUM_RECTS(&this)))
@@ -1087,7 +1087,7 @@ bool sna_tiling_blt_copy_boxes(struct sna *sna, uint8_t alu,
 				assert(bo->pitch <= 8192);
 				assert(bo->tiling != I915_TILING_Y);
 
-				if (!sna_blt_copy_boxes(sna, alu,
+				if (!sna_blt_copy_boxes(sna, GXcopy,
 							src_bo, src_dx, src_dy,
 							bo, -dx, -dy,
 							bpp, REGION_RECTS(&this), REGION_NUM_RECTS(&this)))