diff options
author | Kuoppala, Mika <mika.kuoppala@intel.com> | 2019-07-11 15:30:39 +0300 |
---|---|---|
committer | Chris Wilson <chris@chris-wilson.co.uk> | 2019-11-13 20:12:24 +0000 |
commit | 0ff3c792d4361cb5ebb1322120b17abf342b3489 (patch) | |
tree | 3aaafac2247823689dc76830438219375346759b /tests/i915/gem_exec_params.c | |
parent | 868d38c2bc075b6756ebed486db6e7152ed2c5be (diff) |
i915: Skip if secure batches is not available
If we can't do secure execbuf, there is no point in trying.
Signed-off-by: Kuoppala, Mika <mika.kuoppala@intel.com>
Reviewed-by: Chris Wilson <chris@chris-wilson.co.uk>
Diffstat (limited to 'tests/i915/gem_exec_params.c')
-rw-r--r-- | tests/i915/gem_exec_params.c | 22 |
1 files changed, 20 insertions, 2 deletions
diff --git a/tests/i915/gem_exec_params.c b/tests/i915/gem_exec_params.c index 8f15e645..9c352569 100644 --- a/tests/i915/gem_exec_params.c +++ b/tests/i915/gem_exec_params.c @@ -193,6 +193,19 @@ static void test_batch_first(int fd) gem_close(fd, obj[0].handle); } +static int has_secure_batches(const int fd) +{ + int v = -1; + drm_i915_getparam_t gp = { + .param = I915_PARAM_HAS_SECURE_BATCHES, + .value = &v, + }; + + drmIoctl(fd, DRM_IOCTL_I915_GETPARAM, &gp); + + return v > 0; +} + struct drm_i915_gem_execbuffer2 execbuf; struct drm_i915_gem_exec_object2 gem_exec[1]; uint32_t batch[2] = {MI_BATCH_BUFFER_END}; @@ -340,6 +353,8 @@ igt_main } igt_subtest("secure-non-root") { + igt_require(has_secure_batches(fd)); + igt_fork(child, 1) { igt_drop_root(); @@ -351,9 +366,12 @@ igt_main } igt_subtest("secure-non-master") { - igt_require(__igt_device_set_master(fd) == 0); /* Requires root privilege */ + igt_require(has_secure_batches(fd)); + + /* Requires root privilege... */ + igt_require(__igt_device_set_master(fd) == 0); + igt_device_drop_master(fd); /* ... to drop master! */ - igt_device_drop_master(fd); execbuf.flags = I915_EXEC_RENDER | I915_EXEC_SECURE; RUN_FAIL(EPERM); |