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

[Chris Wilson]

 src/sna/sna_accel.c |    8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

New commits:
commit a6b008d69235cbbb572d7d4b33940d2cedd66556
Author: Chris Wilson <chris at chris-wilson.co.uk>
Date:   Wed Nov 6 11:38:53 2013 +0000

    sna: Fixup unwind checks for future BLT commands
    
    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 77a770a..bf5f16a 100644
--- a/src/sna/sna_accel.c
+++ b/src/sna/sna_accel.c
@@ -11698,7 +11698,7 @@ sna_poly_fill_rect_tiled_8x8_blt(DrawablePtr drawable,
 			} while (--n);
 		}
 
-		if (sna->kgem.nbatch == unwind_batch + 8) {
+		if (sna->kgem.nbatch == unwind_batch + (sna->kgem.gen >= 0100 ? 10 : 8)) {
 			sna->kgem.nbatch = unwind_batch;
 			sna->kgem.nreloc = unwind_reloc;
 			if (sna->kgem.nbatch == 0)
@@ -14405,7 +14405,7 @@ skip:
 		}
 	} while (1);
 
-	if (sna->kgem.nbatch == unwind_batch + 8) {
+	if (sna->kgem.nbatch == unwind_batch + (sna->kgem.gen >= 0100 ? 10 : 8)) {
 		sna->kgem.nbatch = unwind_batch;
 		sna->kgem.nreloc = unwind_reloc;
 		if (sna->kgem.nbatch == 0)
@@ -15150,7 +15150,7 @@ skip:
 		}
 	} while (1);
 
-	if (sna->kgem.nbatch == unwind_batch + 8) {
+	if (sna->kgem.nbatch == unwind_batch + (sna->kgem.gen >= 0100 ? 10 : 8)) {
 		sna->kgem.nbatch = unwind_batch;
 		sna->kgem.nreloc = unwind_reloc;
 		if (sna->kgem.nbatch == 0)
commit 22b6a331d0a102e8a8b9fcac1d75f8c9e16596b6
Author: Chris Wilson <chris at chris-wilson.co.uk>
Date:   Wed Nov 6 09:05:05 2013 +0000

    sna: Clear the execlist if we completely unwind a batch after using 8x8 tiling
    
    Another location, but the right function this time!
    
    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 1ac926f..77a770a 100644
--- a/src/sna/sna_accel.c
+++ b/src/sna/sna_accel.c
@@ -11701,6 +11701,8 @@ sna_poly_fill_rect_tiled_8x8_blt(DrawablePtr drawable,
 		if (sna->kgem.nbatch == unwind_batch + 8) {
 			sna->kgem.nbatch = unwind_batch;
 			sna->kgem.nreloc = unwind_reloc;
+			if (sna->kgem.nbatch == 0)
+				kgem_bo_undo(&sna->kgem, bo);
 		}
 	}
 done: