From d2b7d78064ca224bdcc365bede1b16991d43caa8 Mon Sep 17 00:00:00 2001
From: Chris Wilson <chris@chris-wilson.co.uk>
Date: Mon, 26 Jan 2015 21:30:44 +0000
Subject: [PATCH] sna/dri2: Use existing busy state if semaphores are disabled

Undo d16ac1f30bb (sna/dri2: Prefer to use normal selection criteria for
CopyRegion on small GT) to keep on the current ring as the external bo
if semaphores are disabled.

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

diff --git a/src/sna/sna_dri2.c b/src/sna/sna_dri2.c
index 8bbb598d..fd3edcc0 100644
--- a/src/sna/sna_dri2.c
+++ b/src/sna/sna_dri2.c
@@ -841,7 +841,7 @@ static void sna_dri2_select_mode(struct sna *sna, struct kgem_bo *dst, struct kg
 		return;
 	}
 
-	if (sna->render_state.gt < 2) {
+	if (sna->render_state.gt < 2 && sna->kgem.has_semaphores) {
 		DBG(("%s: small GT [%d], not forcing selection\n",
 		     __FUNCTION__, sna->render_state.gt));
 		return;