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

sna/gen7: Refine ring selection 

Don't force us to select BLT too early if we allow ring switching. As
the RENDER ring benefits from more cacheing over time (e.g. HSW:GT3e) it
becomes much more preferable to use it over the BLT. Since we already
have the logic to decide if ring switching is possible/preferred, relax
the initial checks on where the current activity is to allow switching
between batches.

Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
This commit is contained in:
Chris Wilson 2013-08-11 11:49:04 +01:00
parent 6f3999f38c
commit 8d48a43ed9
1 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/sna/gen7_render.c
View File

@ -2375,7 +2375,7 @@ reuse_source(struct sna *sna,
static bool
prefer_blt_composite(struct sna *sna, struct sna_composite_op *tmp)
{
if (sna->kgem.ring == KGEM_BLT)
if (sna->kgem.mode == KGEM_BLT)
return true;
if (untiled_tlb_miss(tmp->dst.bo) ||
@ -2403,8 +2403,8 @@ gen7_render_composite(struct sna *sna,
if (op >= ARRAY_SIZE(gen7_blend_op))
return false;
DBG(("%s: %dx%d, current mode=%d\n", __FUNCTION__,
width, height, sna->kgem.ring));
DBG(("%s: %dx%d, current mode=%d/%d\n", __FUNCTION__,
width, height, sna->kgem.mode, sna->kgem.ring));
if (mask == NULL &&
try_blt(sna, dst, src, width, height) &&
@ -2691,8 +2691,8 @@ gen7_render_composite_spans(struct sna *sna,
unsigned flags,
struct sna_composite_spans_op *tmp)
{
DBG(("%s: %dx%d with flags=%x, current mode=%d\n", __FUNCTION__,
width, height, flags, sna->kgem.ring));
DBG(("%s: %dx%d with flags=%x, current mode=%d/%d\n", __FUNCTION__,
width, height, flags, sna->kgem.mode, sna->kgem.ring));
assert(gen7_check_composite_spans(sna, op, src, dst, width, height, flags));
@ -2807,7 +2807,7 @@ static inline bool prefer_blt_copy(struct sna *sna,
struct kgem_bo *dst_bo,
unsigned flags)
{
if (sna->kgem.ring == KGEM_BLT)
if (sna->kgem.mode == KGEM_BLT)
return true;
assert((flags & COPY_SYNC) == 0);
@ -3630,7 +3630,7 @@ gen7_render_clear(struct sna *sna, PixmapPtr dst, struct kgem_bo *bo)
dst->drawable.height));
/* Prefer to use the BLT if already engaged */
if (sna->kgem.ring == KGEM_BLT &&
if (sna->kgem.mode == KGEM_BLT &&
gen7_render_clear_try_blt(sna, dst, bo))
return true;