From 5df2de7e14ec320223825db7a5a29a1ac7253ba6 Mon Sep 17 00:00:00 2001 From: Chris Wilson Date: Tue, 15 Mar 2016 09:52:57 +0000 Subject: [PATCH] igt/gem_exec_whisper: Move testing of "default" engine to standalone Exclude the symbolic "default" engine from the interengine sync testing, and move it onto the standalone testing. Signed-off-by: Chris Wilson --- tests/gem_exec_whisper.c | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/tests/gem_exec_whisper.c b/tests/gem_exec_whisper.c index 3da2cfd9..30f26088 100644 --- a/tests/gem_exec_whisper.c +++ b/tests/gem_exec_whisper.c @@ -96,7 +96,13 @@ static int __gem_context_create(int fd, uint32_t *ctx_id) static bool ignore_engine(int gen, unsigned engine) { - return gen == 6 && (engine & ~(3<<13)) == I915_EXEC_BSD; + if (engine == 0) + return true; + + if (gen == 6 && (engine & ~(3<<13)) == I915_EXEC_BSD) + return true; + + return false; } #define CONTEXTS 0x1 @@ -128,7 +134,6 @@ static void whisper(int fd, unsigned engine, unsigned flags) } } else { igt_require(gem_has_ring(fd, engine)); - igt_require(!ignore_engine(gen, engine)); engines[nengine++] = engine; } igt_require(nengine); @@ -348,9 +353,6 @@ igt_main for (const struct intel_execution_engine *e = intel_execution_engines; e->name; e++) { - if (e->exec_id == 0) - continue; - igt_subtest_f("normal-%s", e->name) whisper(fd, e->exec_id | e->flags, 0); igt_subtest_f("contexts-%s", e->name)