[Intel-gfx] [PATCH igt] igt/drv_hangman: Skip aliased I915_EXEC_BSD

Chris Wilson chris at chris-wilson.co.uk
Fri Oct 20 22:36:56 UTC 2017


If the system has bsd2, we do not know which ring the kernel will alias
I915_EXEC_BSD onto and so we do not what the matching string should be.
Skip the unknown.

Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=103324
Signed-off-by: Chris Wilson <chris at chris-wilson.co.uk>
---
 tests/drv_hangman.c | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/tests/drv_hangman.c b/tests/drv_hangman.c
index de57e128..beefcabb 100644
--- a/tests/drv_hangman.c
+++ b/tests/drv_hangman.c
@@ -185,6 +185,15 @@ static void test_error_state_capture(unsigned ring_id,
 	uint64_t offset;
 
 	igt_require(gem_has_ring(device, ring_id));
+
+	/*
+	 * If the device has 2 BSD rings then due to obtuse aliasing in the
+	 * API, we can not determine which ring I915_EXEC_BSD will map to, and
+	 * so must skip the test; as the matching name may be either bsd or
+	 * bsd2 depending on the kernel/test ordering.
+	 */
+	igt_skip_on(ring_id == I915_EXEC_BSD && gem_has_bsd2(device));
+
 	clear_error_state();
 
 	hang = igt_hang_ctx(device, 0, ring_id, HANG_ALLOW_CAPTURE, &offset);
-- 
2.15.0.rc1



More information about the Intel-gfx mailing list