Message ID | 1507742183-27711-1-git-send-email-vinay.belgaumkar@intel.com (mailing list archive) |
---|---|
State | New, archived |
Headers | show |
Quoting Vinay Belgaumkar (2017-10-11 18:16:23) > This limitation does not exist for gen8+. It was removed by this patch- > > commit f7978a0c581a8a840a28306f8da43e06e7fef3bf So where is the mention of gen8 there? And where is the compatibility test to determine the age of the kernel? As a hint, bool has_ctx_exec(int fd, unsigned ring) { struct drm_i915_gem_execbuffer2 execbuf; struct drm_i915_gem_exec_object2 exec; bool supported; /* 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 = gem_context_crate(fd); supported = __gem_execbuf(fd, &execbuf) == -ENOENT; gem_context_destroy(execbuf.rsvd1); return supported; } -Chris
diff --git a/lib/igt_gt.c b/lib/igt_gt.c index b3f3b38..abf789d 100644 --- a/lib/igt_gt.c +++ b/lib/igt_gt.c @@ -214,6 +214,7 @@ void igt_disallow_hang(int fd, igt_hang_t arg) * @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 +240,11 @@ 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); + if (!(intel_gen(intel_get_drm_devid(fd)) >= 8)) + { + /* One day the kernel ABI will be fixed! */ + igt_require(ctx == 0 || ring == I915_EXEC_RENDER); + } param.context = ctx; param.size = 0;
This limitation does not exist for gen8+. It was removed by this patch- commit f7978a0c581a8a840a28306f8da43e06e7fef3bf v2: Added commit id that removes the limitation(Chris Wilson) 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> --- lib/igt_gt.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-)