diff options
author | Chris Wilson <chris@chris-wilson.co.uk> | 2017-05-23 15:46:23 +0100 |
---|---|---|
committer | Chris Wilson <chris@chris-wilson.co.uk> | 2017-05-23 15:47:27 +0100 |
commit | a6f712176c865f924e484148440da71a182f3fde (patch) | |
tree | 430f25fd31b9109489eaafdac4da664cc1f5b5d6 /tests/gem_mmap_wc.c | |
parent | cf279439727b0b32e268698e072045e6f98abba2 (diff) |
igt/gem_mmap_wc: Move the require mmap-wc to the fixture
Not all subtests remembered their requires, so do it from the caller and
catch all at once.
Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
Diffstat (limited to 'tests/gem_mmap_wc.c')
-rw-r--r-- | tests/gem_mmap_wc.c | 20 |
1 files changed, 3 insertions, 17 deletions
diff --git a/tests/gem_mmap_wc.c b/tests/gem_mmap_wc.c index 01f8191a..fd798807 100644 --- a/tests/gem_mmap_wc.c +++ b/tests/gem_mmap_wc.c @@ -127,8 +127,6 @@ test_copy(int fd) { void *src, *dst; - gem_require_mmap_wc(fd); - /* copy from a fresh src to fresh dst to force pagefault on both */ src = create_pointer(fd); dst = create_pointer(fd); @@ -177,8 +175,6 @@ test_read_write2(int fd, enum test_read_write order) void *r, *w; volatile uint32_t val = 0; - gem_require_mmap_wc(fd); - handle = gem_create(fd, OBJECT_SIZE); set_domain(fd, handle); @@ -205,8 +201,6 @@ test_write(int fd) void *src; uint32_t dst; - gem_require_mmap_wc(fd); - /* copy from a fresh src to fresh dst to force pagefault on both */ src = create_pointer(fd); dst = gem_create(fd, OBJECT_SIZE); @@ -251,8 +245,6 @@ test_write_gtt(int fd) char *dst_gtt; void *src; - gem_require_mmap_wc(fd); - dst = gem_create(fd, OBJECT_SIZE); set_domain(fd, dst); @@ -275,8 +267,6 @@ test_read(int fd) void *dst; uint32_t src; - gem_require_mmap_wc(fd); - /* copy from a fresh src to fresh dst to force pagefault on both */ dst = create_pointer(fd); src = gem_create(fd, OBJECT_SIZE); @@ -308,8 +298,6 @@ test_write_cpu_read_wc(int fd, int force_domain) uint32_t handle; uint32_t *src, *dst; - gem_require_mmap_wc(fd); - handle = gem_create(fd, OBJECT_SIZE); dst = gem_mmap__wc(fd, handle, 0, OBJECT_SIZE, PROT_READ); @@ -332,8 +320,6 @@ test_write_gtt_read_wc(int fd) uint32_t handle; uint32_t *src, *dst; - gem_require_mmap_wc(fd); - handle = gem_create(fd, OBJECT_SIZE); set_domain(fd, handle); @@ -424,8 +410,6 @@ test_fault_concurrent(int fd) struct thread_fault_concurrent thread[64]; int n; - gem_require_mmap_wc(fd); - for (n = 0; n < 32; n++) { ptr[n] = create_pointer(fd); } @@ -460,8 +444,10 @@ igt_main if (igt_run_in_simulation()) OBJECT_SIZE = 1 * 1024 * 1024; - igt_fixture + igt_fixture { fd = drm_open_driver(DRIVER_INTEL); + gem_require_mmap_wc(fd); + } igt_subtest("invalid-flags") test_invalid_flags(fd); |