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

[Chris Wilson]

 src/sna/kgem.c |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 946d54238d90f5e31772f0df336ac9a5e7f2d62b
Author: Chris Wilson <chris at chris-wilson.co.uk>
Date:   Tue Aug 21 21:02:00 2012 +0100

    sna: Fix the assertion for tracking proxies in the batch
    
    Signed-off-by: Chris Wilson <chris at chris-wilson.co.uk>

diff --git a/src/sna/kgem.c b/src/sna/kgem.c
index 7498e73..0942917 100644
--- a/src/sna/kgem.c
+++ b/src/sna/kgem.c
@@ -1773,6 +1773,7 @@ static void kgem_commit(struct kgem *kgem)
 
 		assert(!bo->purged);
 		assert(bo->exec);
+		assert(bo->proxy == NULL || bo->exec == &_kgem_dummy_exec);
 		assert(bo->rq == rq || (bo->proxy->rq == rq));
 
 		bo->presumed_offset = bo->exec->offset;
@@ -1789,7 +1790,6 @@ static void kgem_commit(struct kgem *kgem)
 		bo->dirty = false;
 
 		if (bo->proxy) {
-			assert(bo->exec == &_kgem_dummy_exec);
 			/* proxies are not used for domain tracking */
 			list_del(&bo->request);
 			bo->rq = NULL;