From d8dd2b88a1f2bca63a2a6f42af035fd9fb1f685f Mon Sep 17 00:00:00 2001
From: Chris Wilson <chris@chris-wilson.co.uk>
Date: Fri, 13 Mar 2015 22:27:31 +0000
Subject: [PATCH] sna/gen6+: Demote BLT ring switching priority if semaphores
 are disabled

Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
---
 src/sna/gen6_common.h | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/src/sna/gen6_common.h b/src/sna/gen6_common.h
index bfdd66fa..409bab3b 100644
--- a/src/sna/gen6_common.h
+++ b/src/sna/gen6_common.h
@@ -106,12 +106,15 @@ static int prefer_blt_bo(struct sna *sna,
 
 inline static bool force_blt_ring(struct sna *sna)
 {
-	if (sna->flags & SNA_POWERSAVE)
-		return true;
-
 	if (sna->kgem.mode == KGEM_RENDER)
 		return false;
 
+	if (NO_RING_SWITCH(sna))
+		return sna->kgem.ring == KGEM_BLT;
+
+	if (sna->flags & SNA_POWERSAVE)
+		return true;
+
 	if (sna->render_state.gt < 2)
 		return true;