[Intel-gfx] [PATCH xf86-video-intel v3] hmm

[Chris Wilson]

---
 src/sna/gen6_common.h | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/sna/gen6_common.h b/src/sna/gen6_common.h
index b53ec0c9..05f76f83 100644
--- a/src/sna/gen6_common.h
+++ b/src/sna/gen6_common.h
@@ -87,7 +87,7 @@ static int prefer_blt_bo(struct sna *sna,
 	if (PREFER_RENDER)
 		return PREFER_RENDER < 0;
 
-	if (dst->rq)
+	if (__kgem_bo_is_busy(&sna->kgem, dst))
 		return RQ_IS_BLT(dst->rq);
 
 	if (sna->flags & SNA_POWERSAVE)
@@ -97,7 +97,7 @@ static int prefer_blt_bo(struct sna *sna,
 		if (sna->render_state.gt > 1)
 			return false;
 
-		if (src->rq)
+		if (__kgem_bo_is_busy(&sna->kgem, src))
 			return RQ_IS_BLT(src->rq);
 
 		if (src->tiling == I915_TILING_Y)
@@ -157,8 +157,8 @@ prefer_render_ring(struct sna *sna, struct kgem_bo *bo)
 	if (sna->kgem.ring != KGEM_NONE && NO_RING_SWITCH(sna))
                 return false;
 
-	if (kgem_bo_is_render(bo))
-		return true;
+	if (__kgem_bo_is_busy(&sna->kgem, bo))
+		return !RQ_IS_BLT(bo);
 
 	if (sna->flags & SNA_POWERSAVE)
 		return false;
-- 
2.15.0.rc1