Re: [igt-dev] [PATCH v14 2/5] lib: ioctl_wrappers: reach engines by index as well

Tvrtko Ursulin
2019-03-21T07:06:27Z

On 21/03/2019 01:00, Andi Shyti wrote:
> 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 function has been moved from lib/ioctl_wappers to
> lib/i915/gem_context where it is more appropriate.
>
> The previous 'gem_has_ring()' function becomes a wrapper to the
> new 'gem_context_has_engine()'.
>
> Signed-off-by: Andi Shyti <andi.shyti@intel.com>
> Reviewed-by: Chris Wilson <chris@chris-wilson.co.uk>
> ---
> lib/i915/gem_context.c | 21 +++++++++++++++++++++
> lib/i915/gem_context.h | 2 ++
> lib/ioctl_wrappers.c | 19 -------------------
> lib/ioctl_wrappers.h | 3 ++-
> 4 files changed, 25 insertions(+), 20 deletions(-)
>
> diff --git a/lib/i915/gem_context.c b/lib/i915/gem_context.c
> index 16004685e920..5e2e31e91384 100644
> --- a/lib/i915/gem_context.c
> +++ b/lib/i915/gem_context.c
> @@ -275,3 +275,24 @@ void gem_context_set_priority(int fd, uint32_t ctx_id, int prio)
> {
> igt_assert(__gem_context_set_priority(fd, ctx_id, prio) == 0);
> }
> +
> +bool gem_context_has_engine(int fd, unsigned engine, unsigned ctx)

What Chris said and uin32_t for ctx is the usual type.

> +{
> + struct drm_i915_gem_execbuffer2 execbuf;
> + struct drm_i915_gem_exec_object2 exec;
> +
> + /* silly ABI, the kernel thinks everyone who has BSD also has BSD2 */
> + if ((engine & ~(3<<13)) == I915_EXEC_BSD) {
> + if (engine & (3 << 13) && !gem_has_bsd2(fd))
> + return false;
> + }

This will luckily be a no-op on engine maps due bits so high never set
but I wonder if at least a comment is warranted.

Regards,

Tvrtko

> +
> + memset(&exec, 0, sizeof(exec));
> + memset(&execbuf, 0, sizeof(execbuf));
> + execbuf.buffers_ptr = to_user_pointer(&exec);
> + execbuf.buffer_count = 1;
> + execbuf.flags = engine;
> + execbuf.rsvd1 = ctx;
> +
> + return __gem_execbuf(fd, &execbuf) == -ENOENT;
> +}
> diff --git a/lib/i915/gem_context.h b/lib/i915/gem_context.h
> index aef68dda6b26..dd64ebf17fbd 100644
> --- a/lib/i915/gem_context.h
> +++ b/lib/i915/gem_context.h
> @@ -45,4 +45,6 @@ int __gem_context_get_param(int fd, struct drm_i915_gem_context_param *p);
> int __gem_context_set_priority(int fd, uint32_t ctx, int prio);
> void gem_context_set_priority(int fd, uint32_t ctx, int prio);
>
> +bool gem_context_has_engine(int fd, unsigned engine, unsigned ctx);
> +
> #endif /* GEM_CONTEXT_H */
> diff --git a/lib/ioctl_wrappers.c b/lib/ioctl_wrappers.c
> index a66eb4bc0f4f..3f8f0874bc4b 100644
> --- a/lib/ioctl_wrappers.c
> +++ b/lib/ioctl_wrappers.c
> @@ -1253,25 +1253,6 @@ void igt_require_gem(int fd)
> igt_require_f(err == 0, "Unresponsive i915/GEM device\n");
> }
>
> -bool gem_has_ring(int fd, unsigned ring)
> -{
> - struct drm_i915_gem_execbuffer2 execbuf;
> - struct drm_i915_gem_exec_object2 exec;
> -
> - /* silly ABI, the kernel thinks everyone who has BSD also has BSD2 */
> - if ((ring & ~(3<<13)) == I915_EXEC_BSD) {
> - if (ring & (3 << 13) && !gem_has_bsd2(fd))
> - return false;
> - }
> -
> - memset(&exec, 0, sizeof(exec));
> - memset(&execbuf, 0, sizeof(execbuf));
> - execbuf.buffers_ptr = to_user_pointer(&exec);
> - execbuf.buffer_count = 1;
> - execbuf.flags = ring;
> - return __gem_execbuf(fd, &execbuf) == -ENOENT;
> -}
> -
> /**
> * gem_require_ring:
> * @fd: open i915 drm file descriptor
> diff --git a/lib/ioctl_wrappers.h b/lib/ioctl_wrappers.h
> index ad93daffcfd5..8770e591e790 100644
> --- a/lib/ioctl_wrappers.h
> +++ b/lib/ioctl_wrappers.h
> @@ -142,11 +142,12 @@ 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);
> 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(f, r) gem_context_has_engine(f, r, 0)
> +
> /* prime */
> struct local_dma_buf_sync {
> uint64_t flags;