From 7863efebf5bee0dbdad55e5402e02413e26f7a4f Mon Sep 17 00:00:00 2001
From: Chris Wilson <chris@chris-wilson.co.uk>
Date: Fri, 13 Mar 2015 15:21:47 +0000
Subject: [PATCH] sna/gen6+: Relax assertions in light of !semaphores

Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
---
 src/sna/gen6_common.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/sna/gen6_common.h b/src/sna/gen6_common.h
index b6197144..bfdd66fa 100644
--- a/src/sna/gen6_common.h
+++ b/src/sna/gen6_common.h
@@ -125,7 +125,7 @@ prefer_blt_ring(struct sna *sna, struct kgem_bo *bo, unsigned flags)
 		return PREFER_RENDER < 0;
 
 	assert(!force_blt_ring(sna));
-	assert(!kgem_bo_is_render(bo));
+	assert(!kgem_bo_is_render(bo) || NO_RING_SWITCH(sna));
 
 	if (kgem_bo_is_blt(bo))
 		return true;