diff options
| author | Chris Wilson <chris@chris-wilson.co.uk> | 2012-12-27 00:40:08 +0000 |
|---|---|---|
| committer | Chris Wilson <chris@chris-wilson.co.uk> | 2012-12-27 10:16:05 +0000 |
| commit | 46af1ff126f3fb1f9470b0cbb19c7c2b09d5b92a (patch) | |
| tree | fa04cd9aee9a88b207a4e0530ac1efb522dd58e1 /src/sna/gen6_render.c | |
| parent | dd5b653aa2c5fe2e062533db35c83a40c1952ea6 (diff) | |
sna/gen6+: Tidy up ring preferences
Remove a few duplicated tests.
Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
Diffstat (limited to 'src/sna/gen6_render.c')
| -rw-r--r-- | src/sna/gen6_render.c | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/src/sna/gen6_render.c b/src/sna/gen6_render.c index ef1a7c0a..013df6ff 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 |