xf86-video-intel: 2 commits - src/sna/sna_tiling.c src/uxa/intel_glamor.c

[Chris Wilson]

 src/sna/sna_tiling.c   |   20 ++++++++++----------
 src/uxa/intel_glamor.c |    2 +-
 2 files changed, 11 insertions(+), 11 deletions(-)

New commits:
commit b259cbffcfb41a20c8b0cf1c32f6ff3e9872a472
Author: Chris Wilson <chris at chris-wilson.co.uk>
Date:   Sun Apr 20 16:39:37 2014 +0100

    sna: Avoid copying from tiled source for an overwritten fill
    
    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 2d11443..5fc7b40 100644
--- a/src/sna/sna_tiling.c
+++ b/src/sna/sna_tiling.c
@@ -655,22 +655,22 @@ sna_tiling_fill_boxes(struct sna *sna,
 
 				assert(kgem_bo_can_blt(&sna->kgem, bo));
 
-				if (!sna->render.copy_boxes(sna, GXcopy,
-							     dst, dst_bo, 0, 0,
-							     &tmp, bo, -dx, -dy,
-							     REGION_RECTS(&this), REGION_NUM_RECTS(&this), 0))
+				if (op > PictOpSrc &&
+				    !sna->render.copy_boxes(sna, GXcopy,
+							    dst, dst_bo, 0, 0,
+							    &tmp, bo, -dx, -dy,
+							    REGION_RECTS(&this), REGION_NUM_RECTS(&this), 0))
 					goto err;
 
 				RegionTranslate(&this, -dx, -dy);
-				if (!sna->render.fill_boxes(sna, op, format, color,
-							     &tmp, bo,
-							     REGION_RECTS(&this), REGION_NUM_RECTS(&this)))
+				if (!sna->render.fill_boxes(sna, op, format, color, &tmp, bo,
+							    REGION_RECTS(&this), REGION_NUM_RECTS(&this)))
 					goto err;
 
 				if (!sna->render.copy_boxes(sna, GXcopy,
-							     &tmp, bo, 0, 0,
-							     dst, dst_bo, dx, dy,
-							     REGION_RECTS(&this), REGION_NUM_RECTS(&this), 0))
+							    &tmp, bo, 0, 0,
+							    dst, dst_bo, dx, dy,
+							    REGION_RECTS(&this), REGION_NUM_RECTS(&this), 0))
 					goto err;
 
 				kgem_bo_destroy(&sna->kgem, bo);
commit 935ec0abcb3b92b1aad00885be59644bf775f5dd
Author: Chris Wilson <chris at chris-wilson.co.uk>
Date:   Mon Apr 21 08:20:39 2014 +0100

    uxa: Remove misnomer from ATI logs
    
    Signed-off-by: Chris Wilson <chris at chris-wilson.co.uk>

diff --git a/src/uxa/intel_glamor.c b/src/uxa/intel_glamor.c
index d38d381..0be87b8 100644
--- a/src/uxa/intel_glamor.c
+++ b/src/uxa/intel_glamor.c
@@ -248,7 +248,7 @@ intel_glamor_init(ScreenPtr screen)
 
   fail:
 	xf86DrvMsg(scrn->scrnIndex, X_INFO,
-		   "Use standard UXA acceleration.\n");
+		   "Use legacy UXA acceleration.\n");
 	return FALSE;
 }