| Message ID | 1507915340-131422-1-git-send-email-vinay.belgaumkar@intel.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
On Fri, Oct 13, 2017 at 10:22:20AM -0700, Vinay Belgaumkar wrote: > This limitation does not exist in latest kernel. It was removed by this patch- > > commit f7978a0c581a8a840a28306f8da43e06e7fef3bf > > v2: Added commit id that removes the limitation(Chris Wilson) > V3: Generic way to find if kernel supports this instead of hardcoding gens(Chris Wilson) > v4: Optimize the if block (Daniele) > v5: Use the same context instead of creating a dummy (Chris Wilson) > v6: Changed comment structure and removed extra brackets, local var (Chris Wilson) > v7: Removed some more extra brackets > > Cc: Michel Thierry <michel.thierry@intel.com> > Cc: Arkadiusz Hiler <arkadiusz.hiler@intel.com> > Cc: Petri Latvala <petri.latvala@intel.com> > Signed-off-by: Vinay Belgaumkar <vinay.belgaumkar@intel.com> > Reviewed-by: Chris Wilson <chris@chris-wilson.co.uk> Thanks for the patch and the reviews. Pushed. Cheers, Arek > --- > lib/igt_gt.c | 43 +++++++++++++++++++++++++++++++++++++++++-- > 1 file changed, 41 insertions(+), 2 deletions(-) > > diff --git a/lib/igt_gt.c b/lib/igt_gt.c > index b3f3b38..f6cc20b 100644 > --- a/lib/igt_gt.c > +++ b/lib/igt_gt.c > @@ -209,11 +209,50 @@ void igt_disallow_hang(int fd, igt_hang_t arg) > } > > /** > + * has_ctx_exec: > + * @fd: open i915 drm file descriptor > + * @ring: execbuf ring flag > + * @ctx: Context to be checked > + * > + * This helper function checks if non default context submission is allowed > + * on a ring. > + * > + * Returns: > + * True if allowed > + * > + */ > +static bool has_ctx_exec(int fd, unsigned ring, uint32_t ctx) > +{ > + 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; > + execbuf.rsvd1 = ctx; > + /* > + * If context submission is not allowed, this will return EINVAL > + * Otherwise, this will return ENOENT on account of no gem obj > + * being submitted > + */ > + return __gem_execbuf(fd, &execbuf) == -ENOENT; > +} > + > +/** > * igt_hang_ring_ctx: > * @fd: open i915 drm file descriptor > * @ctx: the contxt specifier > * @ring: execbuf ring flag > * @flags: set of flags to control execution > + * @offset: The resultant gtt offset of the exec obj > * > * This helper function injects a hanging batch associated with @ctx into @ring. > * It returns a #igt_hang_t structure which must be passed to > @@ -239,8 +278,8 @@ igt_hang_t igt_hang_ctx(int fd, > > igt_require_hang_ring(fd, ring); > > - /* One day the kernel ABI will be fixed! */ > - igt_require(ctx == 0 || ring == I915_EXEC_RENDER); > + /* check if non-default ctx submission is allowed */ > + igt_require(ctx == 0 || has_ctx_exec(fd, ring, ctx)); > > param.context = ctx; > param.size = 0; > -- > 1.9.1 >
diff --git a/lib/igt_gt.c b/lib/igt_gt.c index b3f3b38..f6cc20b 100644 --- a/lib/igt_gt.c +++ b/lib/igt_gt.c @@ -209,11 +209,50 @@ void igt_disallow_hang(int fd, igt_hang_t arg) } /** + * has_ctx_exec: + * @fd: open i915 drm file descriptor + * @ring: execbuf ring flag + * @ctx: Context to be checked + * + * This helper function checks if non default context submission is allowed + * on a ring. + * + * Returns: + * True if allowed + * + */ +static bool has_ctx_exec(int fd, unsigned ring, uint32_t ctx) +{ + 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; + execbuf.rsvd1 = ctx; + /* + * If context submission is not allowed, this will return EINVAL + * Otherwise, this will return ENOENT on account of no gem obj + * being submitted + */ + return __gem_execbuf(fd, &execbuf) == -ENOENT; +} + +/** * igt_hang_ring_ctx: * @fd: open i915 drm file descriptor * @ctx: the contxt specifier * @ring: execbuf ring flag * @flags: set of flags to control execution + * @offset: The resultant gtt offset of the exec obj * * This helper function injects a hanging batch associated with @ctx into @ring. * It returns a #igt_hang_t structure which must be passed to @@ -239,8 +278,8 @@ igt_hang_t igt_hang_ctx(int fd, igt_require_hang_ring(fd, ring); - /* One day the kernel ABI will be fixed! */ - igt_require(ctx == 0 || ring == I915_EXEC_RENDER); + /* check if non-default ctx submission is allowed */ + igt_require(ctx == 0 || has_ctx_exec(fd, ring, ctx)); param.context = ctx; param.size = 0;