igt/gem_userptr_blits: Fix up last minute API changes

When the patch was merged, the ioctl numbers had to be adjusted to leave
no holes. Also there was a final piece of munging of the API to
downgrade unsynced userptr for export over dma-buf.

Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>

diff --git a/tests/gem_userptr_blits.c b/tests/gem_userptr_blits.c
index 86c5d66..fcf6fa6 100644 (file)
--- a/tests/gem_userptr_blits.c
+++ b/tests/gem_userptr_blits.c
@@ -63,7 +63,7 @@
 #define PAGE_SIZE 4096
 #endif
 
-#define LOCAL_I915_GEM_USERPTR       0x34
+#define LOCAL_I915_GEM_USERPTR       0x33
 #define LOCAL_IOCTL_I915_GEM_USERPTR DRM_IOWR (DRM_COMMAND_BASE + LOCAL_I915_GEM_USERPTR, struct local_i915_gem_userptr)
 struct local_i915_gem_userptr {
        uint64_t user_ptr;
@@ -664,8 +664,8 @@ static int test_dmabuf(void)
        handle = create_userptr_bo(fd1, sizeof(linear));
 
        ret = export_handle(fd1, handle, &dma_buf_fd);
-       if (userptr_flags & LOCAL_I915_USERPTR_UNSYNCHRONIZED) {
-               igt_assert(ret == EINVAL);
+       if (userptr_flags & LOCAL_I915_USERPTR_UNSYNCHRONIZED && ret) {
+               igt_assert(ret == EINVAL || ret == ENODEV);
                free_userptr_bo(fd1, handle);
 
                return 0;