tests: More require GEM markup

A few more tests that use i915/gem without first checking that the GPU is
working.

Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>

13 files changed, 20 insertions, 1 deletions

diff --git a/tests/drm_vma_limiter_cached.c b/tests/drm_vma_limiter_cached.c
index a47c7970..28841d62 100644
--- a/tests/drm_vma_limiter_cached.c
+++ b/tests/drm_vma_limiter_cached.c
@@ -60,6 +60,7 @@ igt_simple_main
 	igt_skip_on_simulation();
 
 	fd = drm_open_driver(DRIVER_INTEL);
+	igt_require_gem(fd);
 
 	bufmgr = drm_intel_bufmgr_gem_init(fd, 4096);
 	drm_intel_bufmgr_gem_enable_reuse(bufmgr);
diff --git a/tests/gem_bad_blit.c b/tests/gem_bad_blit.c
index 47e6e90d..45dfc809 100644
--- a/tests/gem_bad_blit.c
+++ b/tests/gem_bad_blit.c
@@ -97,6 +97,7 @@ igt_simple_main
 	int fd;
 
 	fd = drm_open_driver(DRIVER_INTEL);
+	igt_require_gem(fd);
 
 	bufmgr = drm_intel_bufmgr_gem_init(fd, 4096);
 	drm_intel_bufmgr_gem_enable_reuse(bufmgr);
diff --git a/tests/gem_bad_reloc.c b/tests/gem_bad_reloc.c
index 2351ce91..7624cd8e 100644
--- a/tests/gem_bad_reloc.c
+++ b/tests/gem_bad_reloc.c
@@ -188,8 +188,10 @@ igt_main
 	const struct intel_execution_engine *e;
 	int fd = -1;
 
-	igt_fixture
+	igt_fixture {
 		fd = drm_open_driver(DRIVER_INTEL);
+		igt_require_gem(fd);
+	}
 
 	for (e = intel_execution_engines; e->name; e++) {
 		igt_subtest_f("negative-reloc-%s", e->name)
diff --git a/tests/gem_double_irq_loop.c b/tests/gem_double_irq_loop.c
index 71ed3b0c..bf69f5ee 100644
--- a/tests/gem_double_irq_loop.c
+++ b/tests/gem_double_irq_loop.c
@@ -96,6 +96,7 @@ igt_simple_main
 	igt_skip_on_simulation();
 
 	fd = drm_open_driver(DRIVER_INTEL);
+	igt_require_gem(fd);
 	devid = intel_get_drm_devid(fd);
 	igt_require_f(HAS_BLT_RING(devid),
 		      "not (yet) implemented for pre-snb\n");
diff --git a/tests/gem_ppgtt.c b/tests/gem_ppgtt.c
index 37d601ce..bed95db8 100644
--- a/tests/gem_ppgtt.c
+++ b/tests/gem_ppgtt.c
@@ -297,6 +297,12 @@ int main(int argc, char **argv)
 {
 	igt_subtest_init(argc, argv);
 
+	igt_fixture {
+		int fd = drm_open_driver(DRIVER_INTEL);
+		igt_require_gem(fd);
+		close(fd);
+	}
+
 	igt_subtest("blt-vs-render-ctx0") {
 		drm_intel_bo *bcs[1], *rcs[N_CHILD];
 
diff --git a/tests/gem_read_read_speed.c b/tests/gem_read_read_speed.c
index 0ac6f830..c1d30f24 100644
--- a/tests/gem_read_read_speed.c
+++ b/tests/gem_read_read_speed.c
@@ -199,6 +199,7 @@ igt_main
 		int devid;
 
 		fd = drm_open_driver(DRIVER_INTEL);
+		igt_require_gem(fd);
 
 		devid = intel_get_drm_devid(fd);
 		igt_require(intel_gen(devid) >= 6);
diff --git a/tests/gem_render_tiled_blits.c b/tests/gem_render_tiled_blits.c
index 22acc459..b2cc7a0c 100644
--- a/tests/gem_render_tiled_blits.c
+++ b/tests/gem_render_tiled_blits.c
@@ -201,6 +201,7 @@ igt_main
 
 	igt_fixture {
 		fd = drm_open_driver(DRIVER_INTEL);
+		igt_require_gem(fd);
 	}
 
 	igt_subtest("basic") {
diff --git a/tests/gem_set_tiling_vs_blt.c b/tests/gem_set_tiling_vs_blt.c
index f6cd5b91..ae1af4ca 100644
--- a/tests/gem_set_tiling_vs_blt.c
+++ b/tests/gem_set_tiling_vs_blt.c
@@ -232,6 +232,7 @@ igt_main
 			data[i] = i;
 
 		fd = drm_open_driver(DRIVER_INTEL);
+		igt_require_gem(fd);
 
 		bufmgr = drm_intel_bufmgr_gem_init(fd, 4096);
 		drm_intel_bufmgr_gem_enable_reuse(bufmgr);
diff --git a/tests/gem_storedw_batches_loop.c b/tests/gem_storedw_batches_loop.c
index 4b0249a6..c0343ccb 100644
--- a/tests/gem_storedw_batches_loop.c
+++ b/tests/gem_storedw_batches_loop.c
@@ -134,6 +134,7 @@ igt_main
 
 	igt_fixture {
 		fd = drm_open_driver(DRIVER_INTEL);
+		igt_require_gem(fd);
 		devid = intel_get_drm_devid(fd);
 
 		has_ppgtt = gem_uses_ppgtt(fd);
diff --git a/tests/gem_unref_active_buffers.c b/tests/gem_unref_active_buffers.c
index 353b40ae..4fafdd04 100644
--- a/tests/gem_unref_active_buffers.c
+++ b/tests/gem_unref_active_buffers.c
@@ -57,6 +57,7 @@ igt_simple_main
 	igt_skip_on_simulation();
 
 	fd = drm_open_driver(DRIVER_INTEL);
+	igt_require_gem(fd);
 
 	bufmgr = drm_intel_bufmgr_gem_init(fd, 4096);
 	igt_assert(bufmgr);
diff --git a/tests/gem_write_read_ring_switch.c b/tests/gem_write_read_ring_switch.c
index d00d4f95..ef229cc5 100644
--- a/tests/gem_write_read_ring_switch.c
+++ b/tests/gem_write_read_ring_switch.c
@@ -153,6 +153,7 @@ igt_main
 
 	igt_fixture {
 		fd = drm_open_driver(DRIVER_INTEL);
+		igt_require_gem(fd);
 
 		/* Test requires MI_FLUSH_DW and MI_COND_BATCH_BUFFER_END */
 		igt_require(intel_gen(intel_get_drm_devid(fd)) >= 6);
diff --git a/tests/kms_render.c b/tests/kms_render.c
index 72da87f1..fd33dfb7 100644
--- a/tests/kms_render.c
+++ b/tests/kms_render.c
@@ -72,6 +72,7 @@ static void gpu_blit(struct igt_fb *dst_fb, struct igt_fb *src_fb)
 	uint32_t devid;
 
 	igt_require_intel(drm_fd);
+	igt_require_gem(drm_fd);
 
 	bufmgr = drm_intel_bufmgr_gem_init(drm_fd, 4096);
 	devid = intel_get_drm_devid(drm_fd);
diff --git a/tests/prime_mmap_coherency.c b/tests/prime_mmap_coherency.c
index fb67ef1f..859bebb9 100644
--- a/tests/prime_mmap_coherency.c
+++ b/tests/prime_mmap_coherency.c
@@ -290,6 +290,7 @@ int main(int argc, char **argv)
 
 	igt_fixture {
 		fd = drm_open_driver(DRIVER_INTEL);
+		igt_require_gem(fd);
 
 		bufmgr = drm_intel_bufmgr_gem_init(fd, 4096);
 		batch = intel_batchbuffer_alloc(bufmgr, intel_get_drm_devid(fd));