From 6e572cfc276874c69c37728d01be64cae268592c Mon Sep 17 00:00:00 2001 From: Arkadiusz Hiler Date: Tue, 11 Jul 2017 13:51:01 +0300 Subject: igt: Add LOCAL defines for distro compatibility Each Linux distro takes a different spin on providing kernel's uapi headers (especialy the *drm*.h). You can get them with linux-headers, you can get them with libdrm. Sometime you can even get them twice, from both sources. Sometimes the headers match your kernel version, sometimes you end up stuck with headers matching the kernel that the given release of the distro came out with. This makes things harder for code that does not depend on libdrm, as we cannot have sane ./configure-time checks. So let's define LOCAL_ version for FENCE and EXECBUFFER2_WB defines until all the stable distros catch up (+/- some epsilon). Cc: Petri Latvala Cc: Chris Wilson Signed-off-by: Arkadiusz Hiler Reviewed-by: Emil Velikov --- benchmarks/gem_exec_tracer.c | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) (limited to 'benchmarks') diff --git a/benchmarks/gem_exec_tracer.c b/benchmarks/gem_exec_tracer.c index d9589853..a49c11a9 100644 --- a/benchmarks/gem_exec_tracer.c +++ b/benchmarks/gem_exec_tracer.c @@ -138,6 +138,9 @@ fail_if(int cond, const char *format, ...) abort(); } +#define LOCAL_I915_EXEC_FENCE_IN (1<<16) +#define LOCAL_I915_EXEC_FENCE_OUT (1<<17) + static void trace_exec(struct trace *trace, const struct drm_i915_gem_execbuffer2 *execbuffer2) @@ -146,7 +149,7 @@ trace_exec(struct trace *trace, const struct drm_i915_gem_exec_object2 *exec_objects = to_ptr(typeof(*exec_objects), execbuffer2->buffers_ptr); - fail_if(execbuffer2->flags & (I915_EXEC_FENCE_IN | I915_EXEC_FENCE_OUT), + fail_if(execbuffer2->flags & (LOCAL_I915_EXEC_FENCE_IN | LOCAL_I915_EXEC_FENCE_OUT), "fences not supported yet\n"); flockfile(trace->file); @@ -268,6 +271,9 @@ static int is_i915(int fd) return strcmp(name, "i915") == 0; } +#define LOCAL_IOCTL_I915_GEM_EXECBUFFER2_WR \ + DRM_IOWR(DRM_COMMAND_BASE + DRM_I915_GEM_EXECBUFFER2, struct drm_i915_gem_execbuffer2) + int ioctl(int fd, unsigned long request, ...) { @@ -326,7 +332,7 @@ ioctl(int fd, unsigned long request, ...) switch (request) { case DRM_IOCTL_I915_GEM_EXECBUFFER2: - case DRM_IOCTL_I915_GEM_EXECBUFFER2_WR: + case LOCAL_IOCTL_I915_GEM_EXECBUFFER2_WR: trace_exec(t, argp); break; -- cgit v1.2.3