From: Ville Syrjälä <ville.syrjala@xxxxxxxxxxxxxxx>
Move gem_bo_busy() from gem_wait_render_timeout.c to lib.
Signed-off-by: Ville Syrjälä <ville.syrjala@xxxxxxxxxxxxxxx>
---
lib/drmtest.c | 10 ++++++++++
lib/drmtest.h | 2 ++
tests/gem_wait_render_timeout.c | 11 -----------
3 files changed, 12 insertions(+), 11 deletions(-)
diff --git a/lib/drmtest.c b/lib/drmtest.c
index 6544128..8f6c74e 100644
--- a/lib/drmtest.c
+++ b/lib/drmtest.c
@@ -641,6 +641,16 @@ void gem_sw_finish(int fd, uint32_t handle)
do_ioctl(fd, DRM_IOCTL_I915_GEM_SW_FINISH, &finish);
}
+bool gem_bo_busy(int fd, uint32_t handle)
+{
+ struct drm_i915_gem_busy busy;
+
+ busy.handle = handle;
+
+ do_ioctl(fd, DRM_IOCTL_I915_GEM_BUSY, &busy);
+
+ return !!busy.busy;
+}
/* prime */
int prime_handle_to_fd(int fd, uint32_t handle)
diff --git a/lib/drmtest.h b/lib/drmtest.h
index 1a243b1..5e831e5 100644
--- a/lib/drmtest.h
+++ b/lib/drmtest.h
@@ -87,6 +87,8 @@ uint32_t gem_context_create(int fd);
void gem_sw_finish(int fd, uint32_t handle);
+bool gem_bo_busy(int fd, uint32_t handle);
+
/* feature test helpers */
bool gem_uses_aliasing_ppgtt(int fd);
int gem_available_fences(int fd);
diff --git a/tests/gem_wait_render_timeout.c b/tests/gem_wait_render_timeout.c
index ae31729..3253d7f 100644
--- a/tests/gem_wait_render_timeout.c
+++ b/tests/gem_wait_render_timeout.c
@@ -80,17 +80,6 @@ gem_bo_wait_timeout(int fd, uint32_t handle, uint64_t *timeout_ns)
return ret ? -errno : 0;
}
-static bool
-gem_bo_busy(int fd, uint32_t handle)
-{
- struct drm_i915_gem_busy busy;
-
- busy.handle = handle;
- do_or_die(drmIoctl(fd, DRM_IOCTL_I915_GEM_BUSY, &busy));
-
- return !!busy.busy;
-}
-
static void blt_color_fill(struct intel_batchbuffer *batch,
drm_intel_bo *buf,
const unsigned int pages)
--
1.8.3.2
_______________________________________________
Intel-gfx mailing list
Intel-gfx@xxxxxxxxxxxxxxxxxxxxx
http://lists.freedesktop.org/mailman/listinfo/intel-gfx
