xf86-video-intel: src/sna/gen6_render.c src/sna/gen7_render.c

[Chris Wilson]

 src/sna/gen6_render.c |    8 +++-----
 src/sna/gen7_render.c |    8 +++-----
 2 files changed, 6 insertions(+), 10 deletions(-)

New commits:
commit 46af1ff126f3fb1f9470b0cbb19c7c2b09d5b92a
Author: Chris Wilson <chris at chris-wilson.co.uk>
Date:   Thu Dec 27 00:40:08 2012 +0000

    sna/gen6+: Tidy up ring preferences
    
    Remove a few duplicated tests.
    
    Signed-off-by: Chris Wilson <chris at chris-wilson.co.uk>

diff --git a/src/sna/gen6_render.c b/src/sna/gen6_render.c
index ef1a7c0..013df6f 100644
--- a/src/sna/gen6_render.c
+++ b/src/sna/gen6_render.c
@@ -1983,7 +1983,7 @@ static int prefer_blt_bo(struct sna *sna, struct kgem_bo *bo)
 inline static bool prefer_blt_ring(struct sna *sna,
 				   struct kgem_bo *bo)
 {
-	return sna->kgem.ring != KGEM_RENDER || can_switch_to_blt(sna, bo);
+	return can_switch_to_blt(sna, bo);
 }
 
 static bool
@@ -2002,7 +2002,7 @@ try_blt(struct sna *sna,
 		return true;
 	}
 
-	if (can_switch_to_blt(sna, NULL) && sna_picture_is_solid(src, NULL))
+	if (sna_picture_is_solid(src, NULL) && can_switch_to_blt(sna, NULL))
 		return true;
 
 	return false;
@@ -3056,9 +3056,7 @@ static inline bool prefer_blt_fill(struct sna *sna,
 	if (untiled_tlb_miss(bo))
 		return true;
 
-	return (can_switch_to_blt(sna, bo) ||
-		prefer_blt_ring(sna, bo) ||
-		prefer_blt_bo(sna, bo) >= 0);
+	return prefer_blt_ring(sna, bo) || prefer_blt_bo(sna, bo) >= 0;
 }
 
 static bool
diff --git a/src/sna/gen7_render.c b/src/sna/gen7_render.c
index 18d4a5f..52ddb12 100644
--- a/src/sna/gen7_render.c
+++ b/src/sna/gen7_render.c
@@ -2106,7 +2106,7 @@ static int prefer_blt_bo(struct sna *sna, struct kgem_bo *bo)
 inline static bool prefer_blt_ring(struct sna *sna,
 				   struct kgem_bo *bo)
 {
-	return sna->kgem.ring != KGEM_RENDER || can_switch_to_blt(sna, bo);
+	return can_switch_to_blt(sna, bo);
 }
 
 static bool
@@ -2125,7 +2125,7 @@ try_blt(struct sna *sna,
 		return true;
 	}
 
-	if (can_switch_to_blt(sna, NULL) && sna_picture_is_solid(src, NULL))
+	if (sna_picture_is_solid(src, NULL) && can_switch_to_blt(sna, NULL))
 		return true;
 
 	return false;
@@ -3146,9 +3146,7 @@ static inline bool prefer_blt_fill(struct sna *sna,
 	if (untiled_tlb_miss(bo))
 		return true;
 
-	return (can_switch_to_blt(sna, bo) ||
-		prefer_blt_ring(sna, bo) ||
-		prefer_blt_bo(sna, bo) >= 0);
+	return prefer_blt_ring(sna, bo) || prefer_blt_bo(sna, bo) >= 0;
 }
 
 static bool