From 200d0f5d4972f78b8ed0b58cdb99c9a351a79b42 Mon Sep 17 00:00:00 2001 From: Arkadiusz Hiler Date: Wed, 7 Jun 2017 12:11:37 +0200 Subject: benchmarks/gem_wsim: Add LOCAL fence defines Same as in other benchmarks using them, as not every system is updated with libdrm having those defines. Signed-off-by: Arkadiusz Hiler Reviewed-by: Petri Latvala --- benchmarks/gem_wsim.c | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) (limited to 'benchmarks/gem_wsim.c') diff --git a/benchmarks/gem_wsim.c b/benchmarks/gem_wsim.c index 485de158..298e788c 100644 --- a/benchmarks/gem_wsim.c +++ b/benchmarks/gem_wsim.c @@ -54,6 +54,9 @@ #include "ewma.h" +#define LOCAL_I915_EXEC_FENCE_IN (1<<16) +#define LOCAL_I915_EXEC_FENCE_OUT (1<<17) + enum intel_engine_id { RCS, BCS, @@ -728,7 +731,7 @@ eb_update_flags(struct w_step *w, enum intel_engine_id engine, igt_assert(w->emit_fence <= 0); if (w->emit_fence) - w->eb.flags |= I915_EXEC_FENCE_OUT; + w->eb.flags |= LOCAL_I915_EXEC_FENCE_OUT; } static struct drm_i915_gem_exec_object2 * @@ -1507,16 +1510,16 @@ do_eb(struct workload *wrk, struct w_step *w, enum intel_engine_id engine, igt_assert(tgt >= 0 && tgt < w->idx); igt_assert(wrk->steps[tgt].emit_fence > 0); - w->eb.flags |= I915_EXEC_FENCE_IN; + w->eb.flags |= LOCAL_I915_EXEC_FENCE_IN; w->eb.rsvd2 = wrk->steps[tgt].emit_fence; } - if (w->eb.flags & I915_EXEC_FENCE_OUT) + if (w->eb.flags & LOCAL_I915_EXEC_FENCE_OUT) gem_execbuf_wr(fd, &w->eb); else gem_execbuf(fd, &w->eb); - if (w->eb.flags & I915_EXEC_FENCE_OUT) { + if (w->eb.flags & LOCAL_I915_EXEC_FENCE_OUT) { w->emit_fence = w->eb.rsvd2 >> 32; igt_assert(w->emit_fence > 0); } -- cgit v1.2.3