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

[Chris Wilson]

 src/sna/kgem.c      |   10 +++++++---
 src/sna/sna_accel.c |    2 +-
 2 files changed, 8 insertions(+), 4 deletions(-)

New commits:
commit 4b97bf7e6e9e315cc77d940e3be97832a326e702
Author: Chris Wilson <chris at chris-wilson.co.uk>
Date:   Mon Mar 31 13:32:45 2014 +0100

    sna: Use a cheaper check for a replacement operation
    
    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 6a58598..133b046 100644
--- a/src/sna/sna_accel.c
+++ b/src/sna/sna_accel.c
@@ -3566,7 +3566,7 @@ create_gpu_bo:
 	if (priv->gpu_damage) {
 		assert(priv->gpu_bo);
 		if (!priv->cpu_damage || flags & IGNORE_CPU) {
-			if (box_covers_pixmap(pixmap, &region.extents)) {
+			if (flags & REPLACES || box_covers_pixmap(pixmap, &region.extents)) {
 				unsigned int move;
 
 				if (flags & IGNORE_CPU)
commit 76380bcc3c23d75575d37c0436369a8014bd5a3e
Author: Chris Wilson <chris at chris-wilson.co.uk>
Date:   Mon Mar 31 12:46:58 2014 +0100

    sna: Allow reassignment of inactive VMA if not mapped into the GTT
    
    Signed-off-by: Chris Wilson <chris at chris-wilson.co.uk>

diff --git a/src/sna/kgem.c b/src/sna/kgem.c
index 063a1c4..6545835 100644
--- a/src/sna/kgem.c
+++ b/src/sna/kgem.c
@@ -4420,9 +4420,13 @@ large_inactive:
 
 				if (bo->tiling != tiling ||
 				    (tiling != I915_TILING_NONE && bo->pitch != pitch)) {
-					DBG(("inactive vma with wrong tiling: %d < %d\n",
-					     bo->tiling, tiling));
-					continue;
+					if (bo->map__gtt ||
+					    !gem_set_tiling(kgem->fd, bo->handle,
+							    tiling, pitch)) {
+						DBG(("inactive GTT vma with wrong tiling: %d < %d\n",
+						     bo->tiling, tiling));
+						continue;
+					}
 				}
 
 				if (bo->purged && !kgem_bo_clear_purgeable(kgem, bo)) {