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

sna/dri2: Refine ring selection with multiple active rings 

The preference given multiple rings is to the previous writer, or if
none, to the render ring if active.

References: https://bugs.freedesktop.org/show_bug.cgi?id=90671
Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
This commit is contained in:
Chris Wilson 2015-05-27 07:37:35 +01:00
parent a6dd2655cb
commit fb1643f0f9
1 changed files with 21 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
src/sna/sna_dri2.c
View File

@ -870,6 +870,22 @@ static void set_bo(PixmapPtr pixmap, struct kgem_bo *bo)
}
}
#if defined(__GNUC__)
#define popcount(x) __builtin_popcount(x)
#else
static int popcount(unsigned int x)
{
int count = 0;
while (x) {
count += x&1;
x >>= 1;
}
return count;
}
#endif
static void sna_dri2_select_mode(struct sna *sna, struct kgem_bo *dst, struct kgem_bo *src, bool sync)
{
struct drm_i915_gem_busy busy;
@ -940,9 +956,12 @@ static void sna_dri2_select_mode(struct sna *sna, struct kgem_bo *dst, struct kg
* The ultimate question is whether preserving the ring outweighs
* the cost of the query.
*/
mode = KGEM_RENDER;
if (busy.busy & (0xfffe << 16))
if (popcount(busy.busy >> 16) > 1)
mode = busy.busy & 0xffff ? KGEM_BLT : KGEM_RENDER;
else if (busy.busy & (0xfffe << 16))
mode = KGEM_BLT;
else
mode = KGEM_RENDER;
kgem_bo_mark_busy(&sna->kgem, busy.handle == src->handle ? src : dst, mode);
_kgem_set_mode(&sna->kgem, mode);
}