diff options
| author | Chris Wilson <chris@chris-wilson.co.uk> | 2016-09-30 17:41:01 +0100 |
|---|---|---|
| committer | Chris Wilson <chris@chris-wilson.co.uk> | 2016-09-30 18:26:28 +0100 |
| commit | 91d3780aa5a3a2fc742d9f1f6d429e90012b5c4f (patch) | |
| tree | 7e207c4c6cf1b2e0aef54994b5ecc8b2c3571af9 /lib/ioctl_wrappers.c | |
| parent | 2b5a2615475e902aba91d31a8426516b401c43b4 (diff) | |
igt/gem_userptr_blits: Tidy up the debug spam
igt_subtest_group { /* to the request */ }
Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=97934
Diffstat (limited to 'lib/ioctl_wrappers.c')
| -rw-r--r-- | lib/ioctl_wrappers.c | 15 |
1 files changed, 4 insertions, 11 deletions
diff --git a/lib/ioctl_wrappers.c b/lib/ioctl_wrappers.c index ddd71af9..110465e0 100644 --- a/lib/ioctl_wrappers.c +++ b/lib/ioctl_wrappers.c @@ -954,7 +954,6 @@ void gem_context_require_ban_period(int fd) int __gem_userptr(int fd, void *ptr, int size, int read_only, uint32_t flags, uint32_t *handle) { struct local_i915_gem_userptr userptr; - int ret; memset(&userptr, 0, sizeof(userptr)); userptr.user_ptr = (uintptr_t)ptr; @@ -963,17 +962,11 @@ int __gem_userptr(int fd, void *ptr, int size, int read_only, uint32_t flags, ui if (read_only) userptr.flags |= LOCAL_I915_USERPTR_READ_ONLY; - ret = igt_ioctl(fd, LOCAL_IOCTL_I915_GEM_USERPTR, &userptr); - if (ret) - ret = errno; - igt_skip_on_f(ret == ENODEV && - (flags & LOCAL_I915_USERPTR_UNSYNCHRONIZED) == 0 && - !read_only, - "Skipping, synchronized mappings with no kernel CONFIG_MMU_NOTIFIER?"); - if (ret == 0) - *handle = userptr.handle; + if (igt_ioctl(fd, LOCAL_IOCTL_I915_GEM_USERPTR, &userptr)) + return -errno; - return ret; + *handle = userptr.handle; + return 0; } /** |