diff options
Diffstat (limited to 'tests/prime_mmap.c')
| -rw-r--r-- | tests/prime_mmap.c | 26 |
1 files changed, 4 insertions, 22 deletions
diff --git a/tests/prime_mmap.c b/tests/prime_mmap.c index d53185ff..4c765649 100644 --- a/tests/prime_mmap.c +++ b/tests/prime_mmap.c @@ -298,24 +298,6 @@ test_dup(uint32_t region, int size) close (dma_buf_fd); } -/* Used for error case testing to avoid wrapper */ -static int prime_handle_to_fd_no_assert(uint32_t handle, int flags, int *fd_out) -{ - struct drm_prime_handle args; - int ret; - - args.handle = handle; - args.flags = flags; - args.fd = -1; - - ret = drmIoctl(fd, DRM_IOCTL_PRIME_HANDLE_TO_FD, &args); - if (ret) - ret = errno; - *fd_out = args.fd; - - return ret; -} - static bool has_userptr(void) { uint32_t handle = 0; @@ -346,9 +328,9 @@ test_userptr(uint32_t region, int size) gem_userptr(fd, (uint32_t *)ptr, size, 0, 0, &handle); /* export userptr */ - ret = prime_handle_to_fd_no_assert(handle, DRM_CLOEXEC, &dma_buf_fd); + ret = prime_handle_to_fd_no_assert(fd, handle, DRM_CLOEXEC, &dma_buf_fd); if (ret) { - igt_assert(ret == EINVAL || ret == ENODEV); + igt_assert(ret == -EINVAL || ret == -ENODEV); goto free_userptr; } else { igt_assert_eq(ret, 0); @@ -376,7 +358,7 @@ test_errors(uint32_t region, int size) /* Test for invalid flags */ handle = gem_create_in_memory_regions(fd, size, region); for (i = 0; i < ARRAY_SIZE(invalid_flags); i++) { - prime_handle_to_fd_no_assert(handle, invalid_flags[i], &dma_buf_fd); + prime_handle_to_fd_no_assert(fd, handle, invalid_flags[i], &dma_buf_fd); igt_assert_eq(errno, EINVAL); errno = 0; } @@ -386,7 +368,7 @@ test_errors(uint32_t region, int size) handle = gem_create_in_memory_regions(fd, size, region); fill_bo(handle, size); gem_close(fd, handle); - prime_handle_to_fd_no_assert(handle, DRM_CLOEXEC, &dma_buf_fd); + prime_handle_to_fd_no_assert(fd, handle, DRM_CLOEXEC, &dma_buf_fd); igt_assert(dma_buf_fd == -1 && errno == ENOENT); errno = 0; |