From c530011aaaf485157ba6284c0c32c0db83523b64 Mon Sep 17 00:00:00 2001 From: Eric Anholt Date: Thu, 1 May 2008 16:35:12 -0700 Subject: Update mm tests for GEM rename. --- tests/gem_basic.c | 99 +++++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 99 insertions(+) create mode 100644 tests/gem_basic.c (limited to 'tests/gem_basic.c') diff --git a/tests/gem_basic.c b/tests/gem_basic.c new file mode 100644 index 00000000..6e1f3ddb --- /dev/null +++ b/tests/gem_basic.c @@ -0,0 +1,99 @@ +/* + * Copyright © 2008 Intel Corporation + * + * Permission is hereby granted, free of charge, to any person obtaining a + * copy of this software and associated documentation files (the "Software"), + * to deal in the Software without restriction, including without limitation + * the rights to use, copy, modify, merge, publish, distribute, sublicense, + * and/or sell copies of the Software, and to permit persons to whom the + * Software is furnished to do so, subject to the following conditions: + * + * The above copyright notice and this permission notice (including the next + * paragraph) shall be included in all copies or substantial portions of the + * Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL + * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER + * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING + * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS + * IN THE SOFTWARE. + * + * Authors: + * Eric Anholt + * + */ + +#include +#include +#include +#include +#include +#include +#include +#include +#include "drm.h" + +static void +test_bad_unref(int fd) +{ + struct drm_gem_unreference unref; + int ret; + + printf("Testing error return on bad unreference ioctl.\n"); + + unref.handle = 0x10101010; + ret = ioctl(fd, DRM_IOCTL_GEM_UNREFERENCE, &unref); + + assert(ret == -1 && errno == EINVAL); +} + +static void +test_alloc_unref(int fd) +{ + struct drm_gem_alloc alloc; + struct drm_gem_unreference unref; + int ret; + + printf("Testing allocating and unreferencing an object.\n"); + + memset(&alloc, 0, sizeof(alloc)); + alloc.size = 16 * 1024; + ret = ioctl(fd, DRM_IOCTL_GEM_ALLOC, &alloc); + assert(ret == 0); + + unref.handle = alloc.handle; + ret = ioctl(fd, DRM_IOCTL_GEM_UNREFERENCE, &unref); +} + +static void +test_alloc_close(int fd) +{ + struct drm_gem_alloc alloc; + int ret; + + printf("Testing closing with an object allocated.\n"); + + memset(&alloc, 0, sizeof(alloc)); + alloc.size = 16 * 1024; + ret = ioctl(fd, DRM_IOCTL_GEM_ALLOC, &alloc); + assert(ret == 0); + + close(fd); +} + +int main(int argc, char **argv) +{ + int fd; + + fd = drm_open_any(); + + test_bad_unref(fd); + test_alloc_unref(fd); + test_alloc_close(fd); + + close(fd); + + return 0; +} -- cgit v1.2.3 From 6e46a3c762919af05fcc6a08542faa7d185487a1 Mon Sep 17 00:00:00 2001 From: Eric Anholt Date: Mon, 12 May 2008 15:42:20 -0700 Subject: [GEM] Update testcases for new API. --- tests/gem_basic.c | 46 ++++++++++++++++++++++------------------------ 1 file changed, 22 insertions(+), 24 deletions(-) (limited to 'tests/gem_basic.c') diff --git a/tests/gem_basic.c b/tests/gem_basic.c index 6e1f3ddb..8b8b63d0 100644 --- a/tests/gem_basic.c +++ b/tests/gem_basic.c @@ -36,48 +36,48 @@ #include "drm.h" static void -test_bad_unref(int fd) +test_bad_close(int fd) { - struct drm_gem_unreference unref; + struct drm_gem_close close; int ret; - printf("Testing error return on bad unreference ioctl.\n"); + printf("Testing error return on bad close ioctl.\n"); - unref.handle = 0x10101010; - ret = ioctl(fd, DRM_IOCTL_GEM_UNREFERENCE, &unref); + close.handle = 0x10101010; + ret = ioctl(fd, DRM_IOCTL_GEM_CLOSE, &close); assert(ret == -1 && errno == EINVAL); } static void -test_alloc_unref(int fd) +test_create_close(int fd) { - struct drm_gem_alloc alloc; - struct drm_gem_unreference unref; + struct drm_gem_create create; + struct drm_gem_close close; int ret; - printf("Testing allocating and unreferencing an object.\n"); + printf("Testing creating and closing an object.\n"); - memset(&alloc, 0, sizeof(alloc)); - alloc.size = 16 * 1024; - ret = ioctl(fd, DRM_IOCTL_GEM_ALLOC, &alloc); + memset(&create, 0, sizeof(create)); + create.size = 16 * 1024; + ret = ioctl(fd, DRM_IOCTL_GEM_CREATE, &create); assert(ret == 0); - unref.handle = alloc.handle; - ret = ioctl(fd, DRM_IOCTL_GEM_UNREFERENCE, &unref); + close.handle = create.handle; + ret = ioctl(fd, DRM_IOCTL_GEM_CLOSE, &close); } static void -test_alloc_close(int fd) +test_create_fd_close(int fd) { - struct drm_gem_alloc alloc; + struct drm_gem_create create; int ret; printf("Testing closing with an object allocated.\n"); - memset(&alloc, 0, sizeof(alloc)); - alloc.size = 16 * 1024; - ret = ioctl(fd, DRM_IOCTL_GEM_ALLOC, &alloc); + memset(&create, 0, sizeof(create)); + create.size = 16 * 1024; + ret = ioctl(fd, DRM_IOCTL_GEM_CREATE, &create); assert(ret == 0); close(fd); @@ -89,11 +89,9 @@ int main(int argc, char **argv) fd = drm_open_any(); - test_bad_unref(fd); - test_alloc_unref(fd); - test_alloc_close(fd); - - close(fd); + test_bad_close(fd); + test_create_close(fd); + test_create_fd_close(fd); return 0; } -- cgit v1.2.3 From 2655005762b8915d5f44d1d1ee7e6c2eb34841d7 Mon Sep 17 00:00:00 2001 From: Eric Anholt Date: Wed, 11 Jun 2008 14:42:40 -0700 Subject: [gem] Move potentially device-specific ioctls to the intel driver. This is the create (may want location flags), pread/pwrite/mmap (performance tuning hints), and set_domain (will 32 bits be enough for everyone?) ioctls. Left in the generic set are just flink/open/close. The 2D driver must be updated for this change, and API but not ABI is broken for 3D. The driver version is bumped to mark this. --- tests/gem_basic.c | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) (limited to 'tests/gem_basic.c') diff --git a/tests/gem_basic.c b/tests/gem_basic.c index 8b8b63d0..b2176fba 100644 --- a/tests/gem_basic.c +++ b/tests/gem_basic.c @@ -34,6 +34,7 @@ #include #include #include "drm.h" +#include "i915_drm.h" static void test_bad_close(int fd) @@ -52,7 +53,7 @@ test_bad_close(int fd) static void test_create_close(int fd) { - struct drm_gem_create create; + struct drm_i915_gem_create create; struct drm_gem_close close; int ret; @@ -60,7 +61,7 @@ test_create_close(int fd) memset(&create, 0, sizeof(create)); create.size = 16 * 1024; - ret = ioctl(fd, DRM_IOCTL_GEM_CREATE, &create); + ret = ioctl(fd, DRM_IOCTL_I915_GEM_CREATE, &create); assert(ret == 0); close.handle = create.handle; @@ -70,14 +71,14 @@ test_create_close(int fd) static void test_create_fd_close(int fd) { - struct drm_gem_create create; + 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_GEM_CREATE, &create); + ret = ioctl(fd, DRM_IOCTL_I915_GEM_CREATE, &create); assert(ret == 0); close(fd); -- cgit v1.2.3