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

[Chris Wilson]

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

New commits:
commit 64b9f57451501830f8031d1b6ac7289642da032d
Author: Chris Wilson <chris at chris-wilson.co.uk>
Date:   Fri Oct 25 14:27:21 2013 +0100

    sna: Don't assert indirect GPU state
    
    kgem_check_bo_fenced queries whether the GPU is idle, and so its result
    is timing dependent and not suitable for assertion.
    
    Signed-off-by: Chris Wilson <chris at chris-wilson.co.uk>

diff --git a/src/sna/sna_blt.c b/src/sna/sna_blt.c
index 8a6814c..277f53e 100644
--- a/src/sna/sna_blt.c
+++ b/src/sna/sna_blt.c
@@ -2641,13 +2641,14 @@ static bool sna_blt_fill_box(struct sna *sna, uint8_t alu,
 	    !kgem_check_reloc(kgem, 1) ||
 	    !kgem_check_bo_fenced(kgem, bo)) {
 		kgem_submit(kgem);
-		assert(kgem_check_bo_fenced(&sna->kgem, bo));
+		if (!kgem_check_bo_fenced(&sna->kgem, bo))
+			return false;
+
 		_kgem_set_mode(kgem, KGEM_BLT);
 	}
 
 	assert(kgem_check_batch(kgem, 6));
 	assert(kgem_check_reloc(kgem, 1));
-	assert(kgem_check_bo_fenced(kgem, bo));
 
 	b = kgem->batch + kgem->nbatch;
 	b[0] = cmd;