From 9fc445dabf788516d9f6d4956a05277bda1e7f04 Mon Sep 17 00:00:00 2001 From: Lukasz Fiedorowicz Date: Thu, 25 May 2017 09:40:54 +0200 Subject: lib: Moving gem_execbuf_wr to ioctl_wrappers gem_execbuf_wr was duplicated in multiple places. Moving everything to lib/ Signed-off-by: Lukasz Fiedorowicz Reviewed-by: Tvrtko Ursulin --- benchmarks/gem_busy.c | 16 ---------------- benchmarks/gem_latency.c | 16 ---------------- benchmarks/gem_wsim.c | 16 ---------------- 3 files changed, 48 deletions(-) (limited to 'benchmarks') diff --git a/benchmarks/gem_busy.c b/benchmarks/gem_busy.c index bda3e138..c1cee6c0 100644 --- a/benchmarks/gem_busy.c +++ b/benchmarks/gem_busy.c @@ -45,8 +45,6 @@ #include "intel_chipset.h" #include "igt_stats.h" -#define LOCAL_IOCTL_I915_GEM_EXECBUFFER2_WR DRM_IOWR(DRM_COMMAND_BASE + DRM_I915_GEM_EXECBUFFER2, struct drm_i915_gem_execbuffer2) - #define LOCAL_I915_EXEC_NO_RELOC (1<<11) #define LOCAL_I915_EXEC_HANDLE_LUT (1<<12) @@ -73,20 +71,6 @@ static bool gem_busy(int fd, uint32_t handle) return busy.busy != 0; } -static int __gem_execbuf_wr(int fd, struct drm_i915_gem_execbuffer2 *execbuf) -{ - int err = 0; - if (igt_ioctl(fd, LOCAL_IOCTL_I915_GEM_EXECBUFFER2_WR, execbuf)) - err = -errno; - errno = 0; - return err; -} - -static void gem_execbuf_wr(int fd, struct drm_i915_gem_execbuffer2 *execbuf) -{ - igt_assert_eq(__gem_execbuf_wr(fd, execbuf), 0); -} - static bool gem_wait__busy(int fd, uint32_t handle) { struct drm_i915_gem_wait wait; diff --git a/benchmarks/gem_latency.c b/benchmarks/gem_latency.c index 7975ade3..6cb16ba4 100644 --- a/benchmarks/gem_latency.c +++ b/benchmarks/gem_latency.c @@ -45,8 +45,6 @@ #include #include "drm.h" -#define LOCAL_IOCTL_I915_GEM_EXECBUFFER2_WR DRM_IOWR(DRM_COMMAND_BASE + DRM_I915_GEM_EXECBUFFER2, struct drm_i915_gem_execbuffer2) - #define LOCAL_I915_EXEC_FENCE_IN (1<<16) #define LOCAL_I915_EXEC_FENCE_OUT (1<<17) @@ -103,20 +101,6 @@ inline static uint32_t read_timestamp(void) } #endif -static int __gem_execbuf_wr(int _fd, struct drm_i915_gem_execbuffer2 *execbuf) -{ - int err = 0; - if (igt_ioctl(_fd, LOCAL_IOCTL_I915_GEM_EXECBUFFER2_WR, execbuf)) - err = -errno; - errno = 0; - return err; -} - -static void gem_execbuf_wr(int _fd, struct drm_i915_gem_execbuffer2 *execbuf) -{ - igt_assert_eq(__gem_execbuf_wr(_fd, execbuf), 0); -} - struct consumer { pthread_t thread; diff --git a/benchmarks/gem_wsim.c b/benchmarks/gem_wsim.c index b366a5d6..485de158 100644 --- a/benchmarks/gem_wsim.c +++ b/benchmarks/gem_wsim.c @@ -1481,22 +1481,6 @@ static void init_status_page(struct workload *wrk, unsigned int flags) } } -#define LOCAL_IOCTL_I915_GEM_EXECBUFFER2_WR DRM_IOWR(DRM_COMMAND_BASE + DRM_I915_GEM_EXECBUFFER2, struct drm_i915_gem_execbuffer2) - -static int __gem_execbuf_wr(int gemfd, struct drm_i915_gem_execbuffer2 *execbuf) -{ - int err = 0; - if (igt_ioctl(gemfd, LOCAL_IOCTL_I915_GEM_EXECBUFFER2_WR, execbuf)) - err = -errno; - errno = 0; - return err; -} - -static void gem_execbuf_wr(int gemfd, struct drm_i915_gem_execbuffer2 *execbuf) -{ - igt_assert_eq(__gem_execbuf_wr(gemfd, execbuf), 0); -} - static void do_eb(struct workload *wrk, struct w_step *w, enum intel_engine_id engine, unsigned int flags) -- cgit v1.2.3