sna: Don't assert indirect GPU state
authorChris Wilson <chris@chris-wilson.co.uk>
Fri, 25 Oct 2013 13:27:21 +0000 (14:27 +0100)
committerChris Wilson <chris@chris-wilson.co.uk>
Fri, 25 Oct 2013 13:28:46 +0000 (14:28 +0100)
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@chris-wilson.co.uk>
src/sna/sna_blt.c

index 8a6814c..277f53e 100644 (file)
@@ -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;