tests: s/cacheing/caching

Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>

8 files changed, 15 insertions, 15 deletions

diff --git a/tests/.gitignore b/tests/.gitignore
index 8d0b6e5c..6395c731 100644
--- a/tests/.gitignore
+++ b/tests/.gitignore
@@ -9,7 +9,7 @@ gem_bad_batch
 gem_bad_blit
 gem_bad_length
 gem_basic
-gem_cacheing
+gem_caching
 gem_cpu_concurrent_blit
 gem_cpu_reloc
 gem_cs_prefetch
diff --git a/tests/Makefile.am b/tests/Makefile.am
index 5d0ed3e3..8fff22c3 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -17,7 +17,7 @@ endif
 
 TESTS_progs_M = \
 	gem_basic \
-	gem_cacheing \
+	gem_caching \
 	gem_cpu_concurrent_blit \
 	gem_cs_tlb \
 	gem_dummy_reloc_loop \
diff --git a/tests/gem_cacheing.c b/tests/gem_caching.c
index 8a169f1d..d67bbf6b 100644
--- a/tests/gem_cacheing.c
+++ b/tests/gem_caching.c
@@ -119,7 +119,7 @@ int main(int argc, char **argv)
 
 	fd = drm_open_any();
 
-	if (!gem_has_cacheing(fd)) {
+	if (!gem_has_caching(fd)) {
 		printf("no set_caching support detected\n");
 		return 77;
 	}
@@ -138,7 +138,7 @@ int main(int argc, char **argv)
 
 	/* overallocate the buffers we're actually using because */
 	scratch_bo = drm_intel_bo_alloc(bufmgr, "scratch bo", BO_SIZE, 4096);
-	gem_set_cacheing(fd, scratch_bo->handle, 1);
+	gem_set_caching(fd, scratch_bo->handle, 1);
 
 	staging_bo = drm_intel_bo_alloc(bufmgr, "staging bo", BO_SIZE, 4096);
 
diff --git a/tests/gem_partial_pwrite_pread.c b/tests/gem_partial_pwrite_pread.c
index ee176b1d..0330216b 100644
--- a/tests/gem_partial_pwrite_pread.c
+++ b/tests/gem_partial_pwrite_pread.c
@@ -258,7 +258,7 @@ static void do_tests(int cache_level, const char *suffix)
 	char name[80];
 
 	if (cache_level != -1) {
-		switch (gem_set_cacheing(fd, scratch_bo->handle, cache_level)) {
+		switch (gem_set_caching(fd, scratch_bo->handle, cache_level)) {
 		case 0: break;
 		case -EINVAL:
 		case -ENOTTY:
diff --git a/tests/gem_pread.c b/tests/gem_pread.c
index 7037221b..7c2f18f3 100644
--- a/tests/gem_pread.c
+++ b/tests/gem_pread.c
@@ -120,7 +120,7 @@ int main(int argc, char **argv)
 	}
 
 	for (c = cache; c->level != -1; c++) {
-		if (gem_set_cacheing(fd, dst, c->level))
+		if (gem_set_caching(fd, dst, c->level))
 			continue;
 
 		for (count = 1; count <= 1<<17; count <<= 1) {
diff --git a/tests/gem_pread_after_blit.c b/tests/gem_pread_after_blit.c
index dce82413..55caa98d 100644
--- a/tests/gem_pread_after_blit.c
+++ b/tests/gem_pread_after_blit.c
@@ -131,8 +131,8 @@ static void do_test(int fd, int cache_level,
 		    int loop)
 {
 	if (cache_level != -1) {
-		if (gem_set_cacheing(fd, tmp[0]->handle, cache_level) ||
-		    gem_set_cacheing(fd, tmp[1]->handle, cache_level))
+		if (gem_set_caching(fd, tmp[0]->handle, cache_level) ||
+		    gem_set_caching(fd, tmp[1]->handle, cache_level))
 			return;
 	}
 
diff --git a/tests/gem_pwrite.c b/tests/gem_pwrite.c
index abdf1190..87acbf55 100644
--- a/tests/gem_pwrite.c
+++ b/tests/gem_pwrite.c
@@ -127,7 +127,7 @@ int main(int argc, char **argv)
 	}
 
 	for (c = cache; c->level != -1; c++) {
-		if (gem_set_cacheing(fd, dst, c->level))
+		if (gem_set_caching(fd, dst, c->level))
 			continue;
 
 		for (count = 1; count <= 1<<17; count <<= 1) {
diff --git a/tests/gem_pwrite_pread.c b/tests/gem_pwrite_pread.c
index 1f9187fc..65427c3e 100644
--- a/tests/gem_pwrite_pread.c
+++ b/tests/gem_pwrite_pread.c
@@ -398,8 +398,8 @@ int main(int argc, char **argv)
 	src = gem_create(fd, object_size);
 	tmp = malloc(object_size);
 
-	if (gem_set_cacheing(fd, src, 0) == 0 &&
-	    gem_set_cacheing(fd, dst, 0) == 0) {
+	if (gem_set_caching(fd, src, 0) == 0 &&
+	    gem_set_caching(fd, dst, 0) == 0) {
 		if (drmtest_run_subtest("uncached-copy-correctness"))
 			test_copy(fd, src, dst, tmp, object_size);
 		if (drmtest_run_subtest("uncached-copy-performance")) {
@@ -435,8 +435,8 @@ int main(int argc, char **argv)
 		}
 	}
 
-	if (gem_set_cacheing(fd, src, 1) == 0 &&
-	    gem_set_cacheing(fd, dst, 1) == 0) {
+	if (gem_set_caching(fd, src, 1) == 0 &&
+	    gem_set_caching(fd, dst, 1) == 0) {
 		if (drmtest_run_subtest("snooped-copy-correctness"))
 			test_copy(fd, src, dst, tmp, object_size);
 		if (drmtest_run_subtest("snooped-copy-performance")) {
@@ -472,8 +472,8 @@ int main(int argc, char **argv)
 		}
 	}
 
-	if (gem_set_cacheing(fd, src, 2) == 0 &&
-	    gem_set_cacheing(fd, dst, 2) == 0) {
+	if (gem_set_caching(fd, src, 2) == 0 &&
+	    gem_set_caching(fd, dst, 2) == 0) {
 		if (drmtest_run_subtest("display-copy-correctness"))
 			test_copy(fd, src, dst, tmp, object_size);
 		if (drmtest_run_subtest("display-copy-performance")) {