From de70769cc0a24d4d594aaa4c1f99b4a3fc8f05fe Mon Sep 17 00:00:00 2001 From: Chris Wilson Date: Wed, 27 Jan 2016 16:28:35 +0000 Subject: [PATCH] Add I915_EXEC_DEFAULT to list of known engines I dropped this from the list of rings for some tests when refactoring to a common array. Almost all of the tests should be run over the default exec engine to ensure ABI backwards compatiblity. Signed-off-by: Chris Wilson --- lib/igt_gt.c | 1 + tests/gem_busy.c | 6 +++++- tests/gem_ringfill.c | 2 +- 3 files changed, 7 insertions(+), 2 deletions(-) diff --git a/lib/igt_gt.c b/lib/igt_gt.c index 3207e515..ebff9030 100644 --- a/lib/igt_gt.c +++ b/lib/igt_gt.c @@ -539,6 +539,7 @@ 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*/ }, diff --git a/tests/gem_busy.c b/tests/gem_busy.c index f6710de8..4605d04e 100644 --- a/tests/gem_busy.c +++ b/tests/gem_busy.c @@ -233,9 +233,13 @@ igt_main igt_require(has_semaphores(fd)); } - for (e = intel_execution_engines; e->name; e++) + for (e = intel_execution_engines; e->name; e++) { + if (e->exec_id == 0) /* default exec-id is purely symbolic */ + continue; + igt_subtest_f("%s", e->name) test_ring(fd, e->exec_id, e->flags); + } igt_fixture close(fd); diff --git a/tests/gem_ringfill.c b/tests/gem_ringfill.c index dd88fcdc..bd1f371b 100644 --- a/tests/gem_ringfill.c +++ b/tests/gem_ringfill.c @@ -212,7 +212,7 @@ igt_main for (mode = modes; mode->prefix; mode++) { for (e = intel_execution_engines; e->name; e++) { igt_subtest_f("%s%s%s", - e->exec_id || mode->flags ? "" : mode->prefix, + e->exec_id || (mode->flags & ~INTERRUPTIBLE) ? "" : mode->prefix, e->name, mode->suffix) run_test(fd, e->exec_id | e->flags, mode->flags);