[Intel-gfx] [PATCH i-g-t 2/2] igt/drv_hangman: Skip if resets are disallowed

Chris Wilson chris at chris-wilson.co.uk
Thu Feb 21 10:19:44 UTC 2019


If we tell the machine to reset but they are disallowed, we will leave
the system in a wedged state, preventing the majority of subsequent
tests.

Signed-off-by: Chris Wilson <chris at chris-wilson.co.uk>
---
 tests/i915/i915_hangman.c | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/tests/i915/i915_hangman.c b/tests/i915/i915_hangman.c
index df1e0afed..4e515e3a0 100644
--- a/tests/i915/i915_hangman.c
+++ b/tests/i915/i915_hangman.c
@@ -257,6 +257,7 @@ static void hangcheck_unterminated(void)
 igt_main
 {
 	const struct intel_execution_engine *e;
+	igt_hang_t hang = {};
 
 	igt_skip_on_simulation();
 
@@ -266,6 +267,8 @@ igt_main
 		device = drm_open_driver(DRIVER_INTEL);
 		igt_require_gem(device);
 
+		hang = igt_allow_hang(device, 0, HANG_ALLOW_CAPTURE);
+
 		sysfs = igt_sysfs_open(device, &idx);
 		igt_assert(sysfs != -1);
 
@@ -288,4 +291,8 @@ igt_main
 
 	igt_subtest("hangcheck-unterminated")
 		hangcheck_unterminated();
+
+	igt_fixture {
+		igt_disallow_hang(device, hang);
+	}
 }
-- 
2.20.1



More information about the Intel-gfx mailing list