summaryrefslogtreecommitdiff
path: root/tests
diff options
context:
space:
mode:
authorDaniel Vetter <daniel.vetter@ffwll.ch>2015-02-06 11:05:28 +0100
committerDaniel Vetter <daniel.vetter@ffwll.ch>2015-02-13 09:35:35 +0100
commita3e34ce258aae0602c38fd8020d49f1fd1c7a83f (patch)
tree005809bd19010227d99e81e35631799ae817a94f /tests
parentc18b2d57a98c061845e0ec31bfffc90e03356aaa (diff)
lib/ioctl: gem_ prefix for igt_require_mmap_wc
We stick to the overall prefix even for magic require functions. Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
Diffstat (limited to 'tests')
-rw-r--r--tests/gem_concurrent_blit.c4
-rw-r--r--tests/gem_fence_upload.c2
-rw-r--r--tests/gem_mmap_wc.c16
-rw-r--r--tests/gem_tiled_wc.c2
4 files changed, 12 insertions, 12 deletions
diff --git a/tests/gem_concurrent_blit.c b/tests/gem_concurrent_blit.c
index 245ad458..cec6ea49 100644
--- a/tests/gem_concurrent_blit.c
+++ b/tests/gem_concurrent_blit.c
@@ -174,7 +174,7 @@ wc_create_bo(drm_intel_bufmgr *bufmgr, int width, int height)
{
drm_intel_bo *bo;
- igt_require_mmap_wc(fd);
+ gem_require_mmap_wc(fd);
bo = unmapped_create_bo(bufmgr, width, height);
bo->virtual = gem_mmap__wc(fd, bo->handle, 0, bo->size, PROT_READ | PROT_WRITE);
@@ -696,7 +696,7 @@ static void gtt_require(void)
static void wc_require(void)
{
bit17_require();
- igt_require_mmap_wc(fd);
+ gem_require_mmap_wc(fd);
}
static void bcs_require(void)
diff --git a/tests/gem_fence_upload.c b/tests/gem_fence_upload.c
index 81f797b4..9595bc82 100644
--- a/tests/gem_fence_upload.c
+++ b/tests/gem_fence_upload.c
@@ -345,7 +345,7 @@ static void wc_contention(void)
double linear[2], tiled[2];
fd = drm_open_any();
- igt_require_mmap_wc(fd);
+ gem_require_mmap_wc(fd);
num_fences = gem_available_fences(fd);
igt_require(num_fences > 0);
diff --git a/tests/gem_mmap_wc.c b/tests/gem_mmap_wc.c
index 87916b6e..73a97d55 100644
--- a/tests/gem_mmap_wc.c
+++ b/tests/gem_mmap_wc.c
@@ -130,7 +130,7 @@ test_copy(int fd)
{
void *src, *dst;
- igt_require_mmap_wc(fd);
+ gem_require_mmap_wc(fd);
/* copy from a fresh src to fresh dst to force pagefault on both */
src = create_pointer(fd);
@@ -180,7 +180,7 @@ test_read_write2(int fd, enum test_read_write order)
void *r, *w;
volatile uint32_t val = 0;
- igt_require_mmap_wc(fd);
+ gem_require_mmap_wc(fd);
handle = gem_create(fd, OBJECT_SIZE);
set_domain(fd, handle);
@@ -210,7 +210,7 @@ test_write(int fd)
void *src;
uint32_t dst;
- igt_require_mmap_wc(fd);
+ gem_require_mmap_wc(fd);
/* copy from a fresh src to fresh dst to force pagefault on both */
src = create_pointer(fd);
@@ -229,7 +229,7 @@ test_write_gtt(int fd)
char *dst_gtt;
void *src;
- igt_require_mmap_wc(fd);
+ gem_require_mmap_wc(fd);
dst = gem_create(fd, OBJECT_SIZE);
set_domain(fd, dst);
@@ -253,7 +253,7 @@ test_read(int fd)
void *dst;
uint32_t src;
- igt_require_mmap_wc(fd);
+ gem_require_mmap_wc(fd);
/* copy from a fresh src to fresh dst to force pagefault on both */
dst = create_pointer(fd);
@@ -271,7 +271,7 @@ test_write_cpu_read_wc(int fd)
uint32_t handle;
uint32_t *src, *dst;
- igt_require_mmap_wc(fd);
+ gem_require_mmap_wc(fd);
handle = gem_create(fd, OBJECT_SIZE);
@@ -296,7 +296,7 @@ test_write_gtt_read_wc(int fd)
uint32_t handle;
uint32_t *src, *dst;
- igt_require_mmap_wc(fd);
+ gem_require_mmap_wc(fd);
handle = gem_create(fd, OBJECT_SIZE);
set_domain(fd, handle);
@@ -390,7 +390,7 @@ test_fault_concurrent(int fd)
struct thread_fault_concurrent thread[64];
int n;
- igt_require_mmap_wc(fd);
+ gem_require_mmap_wc(fd);
for (n = 0; n < 32; n++) {
ptr[n] = create_pointer(fd);
diff --git a/tests/gem_tiled_wc.c b/tests/gem_tiled_wc.c
index f7053781..b0f7a655 100644
--- a/tests/gem_tiled_wc.c
+++ b/tests/gem_tiled_wc.c
@@ -136,7 +136,7 @@ igt_simple_main
uint32_t handle;
fd = drm_open_any();
- igt_require_mmap_wc(fd);
+ gem_require_mmap_wc(fd);
handle = create_bo(fd);
get_tiling(fd, handle, &tiling, &swizzle);