[igt-dev] [RFC PATCH v9 4/5] lib: ioctl_wrappers: reach engines by index as well
Andi Shyti
andi.shyti at intel.com
Thu Feb 14 00:44:44 UTC 2019
With the new engine query method engines are reachable through
an index and context they are combined with.
The 'gem_has_ring()' becomes 'gem_context_has_engine()' that
requires the index that the engine is mapped within the driver.
The previous 'gem_has_ring()' function becomes a wrapper to the new
'gem_context_has_engine()'.
Signed-off-by: Andi Shyti <andi.shyti at intel.com>
---
lib/ioctl_wrappers.c | 4 +++-
lib/ioctl_wrappers.h | 4 +++-
2 files changed, 6 insertions(+), 2 deletions(-)
diff --git a/lib/ioctl_wrappers.c b/lib/ioctl_wrappers.c
index 404c2fbf9355..4303607f9279 100644
--- a/lib/ioctl_wrappers.c
+++ b/lib/ioctl_wrappers.c
@@ -1465,7 +1465,7 @@ void igt_require_gem(int fd)
igt_require_f(err == 0, "Unresponsive i915/GEM device\n");
}
-bool gem_has_ring(int fd, unsigned ring)
+bool gem_context_has_engine(int fd, unsigned ring, unsigned ctx)
{
struct drm_i915_gem_execbuffer2 execbuf;
struct drm_i915_gem_exec_object2 exec;
@@ -1481,6 +1481,8 @@ bool gem_has_ring(int fd, unsigned ring)
execbuf.buffers_ptr = to_user_pointer(&exec);
execbuf.buffer_count = 1;
execbuf.flags = ring;
+ execbuf.rsvd1 = ctx;
+
return __gem_execbuf(fd, &execbuf) == -ENOENT;
}
diff --git a/lib/ioctl_wrappers.h b/lib/ioctl_wrappers.h
index b22b36b0b2dd..847380d69826 100644
--- a/lib/ioctl_wrappers.h
+++ b/lib/ioctl_wrappers.h
@@ -164,11 +164,13 @@ bool gem_has_exec_fence(int fd);
/* check functions which auto-skip tests by calling igt_skip() */
void gem_require_caching(int fd);
-bool gem_has_ring(int fd, unsigned ring);
+bool gem_context_has_engine(int fd, unsigned ring, unsigned ctx);
void gem_require_ring(int fd, unsigned ring);
bool gem_has_mocs_registers(int fd);
void gem_require_mocs_registers(int fd);
+#define gem_has_ring(fd, ring) gem_context_has_engine(fd, ring, 0)
+
/* prime */
struct local_dma_buf_sync {
uint64_t flags;
--
2.20.1
More information about the igt-dev
mailing list