diff options
| author | Lukasz Fiedorowicz <lukasz.fiedorowicz@intel.com> | 2017-05-25 09:40:54 +0200 |
|---|---|---|
| committer | Petri Latvala <petri.latvala@intel.com> | 2017-05-31 17:04:37 +0300 |
| commit | 9fc445dabf788516d9f6d4956a05277bda1e7f04 (patch) | |
| tree | 7d06cb94367c0a062aaa8f22402da23d554a625d /tests | |
| parent | d9dcfc3a91cc197d07433cc4fbaaa76929b38e29 (diff) | |
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 <lukasz.fiedorowicz@intel.com>
Reviewed-by: Tvrtko Ursulin <tvrtko.ursulin@intel.com>
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/gem_exec_fence.c | 16 | ||||
| -rw-r--r-- | tests/gem_exec_nop.c | 16 |
2 files changed, 0 insertions, 32 deletions
diff --git a/tests/gem_exec_fence.c b/tests/gem_exec_fence.c index 05e55f03..82b0c89a 100644 --- a/tests/gem_exec_fence.c +++ b/tests/gem_exec_fence.c @@ -31,10 +31,8 @@ IGT_TEST_DESCRIPTION("Check that execbuf waits for explicit fences"); -#define LOCAL_PARAM_HAS_EXEC_FENCE 44 #define LOCAL_EXEC_FENCE_IN (1 << 16) #define LOCAL_EXEC_FENCE_OUT (1 << 17) -#define LOCAL_IOCTL_I915_GEM_EXECBUFFER2_WR DRM_IOWR(DRM_COMMAND_BASE + DRM_I915_GEM_EXECBUFFER2, struct drm_i915_gem_execbuffer2) #ifndef SYNC_IOC_MERGE struct sync_merge_data { @@ -101,20 +99,6 @@ static void store(int fd, unsigned ring, int fence, uint32_t target, unsigned of gem_close(fd, obj[BATCH].handle); } -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 fence_busy(int fence) { return poll(&(struct pollfd){fence, POLLIN}, 1, 0) == 0; diff --git a/tests/gem_exec_nop.c b/tests/gem_exec_nop.c index 440e3571..45ab47d3 100644 --- a/tests/gem_exec_nop.c +++ b/tests/gem_exec_nop.c @@ -489,22 +489,6 @@ static void sequential(int fd, uint32_t handle, unsigned flags, int timeout) } #define LOCAL_EXEC_FENCE_OUT (1 << 17) -#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 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 fence_enable_signaling(int fence) { return poll(&(struct pollfd){fence, POLLIN}, 1, 0) == 0; |