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

[Chris Wilson]

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

New commits:
commit de73c5fd1cd4f948b8bd3582ae788f6f855c5b16
Author: Chris Wilson <chris at chris-wilson.co.uk>
Date:   Tue Feb 4 20:57:24 2014 +0000

    sna: Tweak assert_bo_retired() to be callable on cached bo
    
    References: https://bugs.freedesktop.org/show_bug.cgi?id=73406
    Signed-off-by: Chris Wilson <chris at chris-wilson.co.uk>

diff --git a/src/sna/kgem.c b/src/sna/kgem.c
index 788b710..cb64cac 100644
--- a/src/sna/kgem.c
+++ b/src/sna/kgem.c
@@ -506,12 +506,13 @@ static void kgem_bo_retire(struct kgem *kgem, struct kgem_bo *bo)
 	if (bo->rq) {
 		__kgem_bo_clear_busy(bo);
 		kgem_retire(kgem);
+		assert_bo_retired(bo);
 	} else {
+		assert(bo->exec == NULL);
+		assert(list_is_empty(&bo->request));
 		assert(!bo->needs_flush);
 		ASSERT_IDLE(kgem, bo->handle);
 	}
-
-	assert_bo_retired(bo);
 }
 
 static void kgem_bo_maybe_retire(struct kgem *kgem, struct kgem_bo *bo)