diff options
author | Daniel Vetter <daniel.vetter@ffwll.ch> | 2012-03-24 19:30:29 +0100 |
---|---|---|
committer | Daniel Vetter <daniel.vetter@ffwll.ch> | 2012-03-24 19:30:29 +0100 |
commit | 9dbce0991f4eb353ab892c88299bbebf2cb1a285 (patch) | |
tree | 95c7a81ccbb05d64efd27bfcb58f506e625c565e /tests | |
parent | ff93f351512a194dd3d32e643c7987b5fe2347a5 (diff) |
tests: use gem_create and gem_close more
Signed-Off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
Diffstat (limited to 'tests')
-rw-r--r-- | tests/gem_basic.c | 19 | ||||
-rw-r--r-- | tests/gem_mmap.c | 12 | ||||
-rw-r--r-- | tests/gem_readwrite.c | 7 |
3 files changed, 8 insertions, 30 deletions
diff --git a/tests/gem_basic.c b/tests/gem_basic.c index 2e29c281..24ad445f 100644 --- a/tests/gem_basic.c +++ b/tests/gem_basic.c @@ -56,31 +56,22 @@ test_bad_close(int fd) static void test_create_close(int fd) { - struct drm_i915_gem_create create; - int ret; + uint32_t handle; printf("Testing creating and closing an object.\n"); - memset(&create, 0, sizeof(create)); - create.size = 16 * 1024; - ret = ioctl(fd, DRM_IOCTL_I915_GEM_CREATE, &create); - assert(ret == 0); + handle = gem_create(fd, 16*1024); - gem_close(fd, create.handle); + gem_close(fd, handle); } static void test_create_fd_close(int fd) { - struct drm_i915_gem_create create; - int ret; - printf("Testing closing with an object allocated.\n"); - memset(&create, 0, sizeof(create)); - create.size = 16 * 1024; - ret = ioctl(fd, DRM_IOCTL_I915_GEM_CREATE, &create); - assert(ret == 0); + gem_create(fd, 16*1024); + /* leak it */ close(fd); } diff --git a/tests/gem_mmap.c b/tests/gem_mmap.c index f251d899..6ba6e3b3 100644 --- a/tests/gem_mmap.c +++ b/tests/gem_mmap.c @@ -45,9 +45,7 @@ int main(int argc, char **argv) { int fd; - struct drm_i915_gem_create create; struct drm_i915_gem_mmap gem_mmap; - struct drm_gem_close unref; uint8_t expected[OBJECT_SIZE]; uint8_t buf[OBJECT_SIZE]; uint8_t *addr; @@ -64,11 +62,7 @@ int main(int argc, char **argv) ret = ioctl(fd, DRM_IOCTL_I915_GEM_MMAP, &gem_mmap); assert(ret == -1 && errno == ENOENT); - memset(&create, 0, sizeof(create)); - create.size = OBJECT_SIZE; - ret = ioctl(fd, DRM_IOCTL_I915_GEM_CREATE, &create); - assert(ret == 0); - handle = create.handle; + handle = gem_create(fd, OBJECT_SIZE); printf("Testing mmaping of newly created object.\n"); gem_mmap.handle = handle; @@ -90,9 +84,7 @@ int main(int argc, char **argv) assert(memcmp(buf, addr, sizeof(buf)) == 0); printf("Testing that mapping stays after close\n"); - unref.handle = handle; - ret = ioctl(fd, DRM_IOCTL_GEM_CLOSE, &unref); - assert(ret == 0); + gem_close(fd, handle); assert(memcmp(buf, addr, sizeof(buf)) == 0); printf("Testing unmapping\n"); diff --git a/tests/gem_readwrite.c b/tests/gem_readwrite.c index e8a2b7e7..68c3ff28 100644 --- a/tests/gem_readwrite.c +++ b/tests/gem_readwrite.c @@ -77,7 +77,6 @@ do_write(int fd, int handle, void *buf, int offset, int size) int main(int argc, char **argv) { int fd; - struct drm_i915_gem_create create; uint8_t expected[OBJECT_SIZE]; uint8_t buf[OBJECT_SIZE]; int ret; @@ -85,11 +84,7 @@ int main(int argc, char **argv) fd = drm_open_any(); - memset(&create, 0, sizeof(create)); - create.size = OBJECT_SIZE; - ret = ioctl(fd, DRM_IOCTL_I915_GEM_CREATE, &create); - assert(ret == 0); - handle = create.handle; + handle = gem_create(fd, OBJECT_SIZE); printf("Testing contents of newly created object.\n"); ret = do_read(fd, handle, buf, 0, OBJECT_SIZE); |