Aurelien
/
xf86-video-intel
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

sna/gen6+: Tidy up ring preferences 

Remove a few duplicated tests.

Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
This commit is contained in:
Chris Wilson 2012-12-27 00:40:08 +00:00
parent dd5b653aa2
commit 46af1ff126
2 changed files with 6 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/sna/gen6_render.c
View File

@ -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

8
src/sna/gen7_render.c
View File

@ -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