tests/drv_hangman: Convert to using central list of engines

Rather than encoding our own list of engines, use the common one for
greater coverage.

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

3 files changed, 17 insertions, 21 deletions

diff --git a/lib/igt_gt.c b/lib/igt_gt.c
index ebff9030..9f8634b0 100644
--- a/lib/igt_gt.c
+++ b/lib/igt_gt.c
@@ -539,12 +539,12 @@ unsigned intel_detect_and_clear_missed_interrupts(int fd)
 }
 
 const struct intel_execution_engine intel_execution_engines[] = {
-	{ "default", 0, 0 },
-	{ "render", I915_EXEC_RENDER, 0 },
-	{ "bsd", I915_EXEC_BSD, 0 },
-	{ "bsd1", I915_EXEC_BSD, 1<<13 /*I915_EXEC_BSD_RING1*/ },
-	{ "bsd2", I915_EXEC_BSD, 2<<13 /*I915_EXEC_BSD_RING2*/ },
-	{ "blt", I915_EXEC_BLT, 0 },
-	{ "vebox", I915_EXEC_VEBOX, 0 },
+	{ "default", NULL, 0, 0 },
+	{ "render", "render ring", I915_EXEC_RENDER, 0 },
+	{ "bsd", "bsd ring", I915_EXEC_BSD, 0 },
+	{ "bsd1", "bsd ring", I915_EXEC_BSD, 1<<13 /*I915_EXEC_BSD_RING1*/ },
+	{ "bsd2", "bsd2 ring", I915_EXEC_BSD, 2<<13 /*I915_EXEC_BSD_RING2*/ },
+	{ "blt", "blitter ring", I915_EXEC_BLT, 0 },
+	{ "vebox", "video enhancement ring", I915_EXEC_VEBOX, 0 },
 	{ NULL, 0, 0 }
 };
diff --git a/lib/igt_gt.h b/lib/igt_gt.h
index d4a582e2..b7c5c4a9 100644
--- a/lib/igt_gt.h
+++ b/lib/igt_gt.h
@@ -93,6 +93,7 @@ unsigned intel_detect_and_clear_missed_interrupts(int fd);
 
 extern const struct intel_execution_engine {
 	const char *name;
+	const char *full_name;
 	unsigned exec_id;
 	unsigned flags;
 } intel_execution_engines[];
diff --git a/tests/drv_hangman.c b/tests/drv_hangman.c
index 174a517d..8a465cfa 100644
--- a/tests/drv_hangman.c
+++ b/tests/drv_hangman.c
@@ -288,19 +288,10 @@ static void test_error_state_capture(unsigned ring_id,
 	check_error_state(gen, cmd_parser, ring_name, offset);
 }
 
-static const struct target_ring {
-	const int id;
-	const char *short_name;
-	const char *full_name;
-} rings[] = {
-	{ I915_EXEC_RENDER, "render", "render ring" },
-	{ I915_EXEC_BSD, "bsd", "bsd ring" },
-	{ I915_EXEC_BLT, "blt", "blitter ring" },
-	{ I915_EXEC_VEBOX, "vebox", "video enhancement ring" },
-};
-
 igt_main
 {
+	const struct intel_execution_engine *e;
+
 	igt_skip_on_simulation();
 
 	igt_subtest("error-state-debugfs-entry")
@@ -315,8 +306,12 @@ igt_main
 	igt_subtest("error-state-basic")
 		test_error_state_basic();
 
-	for (int i = 0; i < sizeof(rings)/sizeof(rings[0]); i++) {
-		igt_subtest_f("error-state-capture-%s", rings[i].short_name)
-			test_error_state_capture(rings[i].id, rings[i].full_name);
+	for (e = intel_execution_engines; e->name; e++) {
+		if (e->exec_id == 0)
+			continue;
+
+		igt_subtest_f("error-state-capture-%s", e->name)
+			test_error_state_capture(e->exec_id | e->flags,
+						 e->full_name);
 	}
 }