[igt-dev] [PATCH i-g-t 2/2] i915/gem_ctx_exec: Enable resets for basic-nohangcheck

Chris Wilson chris at chris-wilson.co.uk
Sat Oct 26 19:34:56 UTC 2019


Wrap the test inside igt_allow_hang as we depend upon a fast reset to
cancel the hostile context.

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

diff --git a/tests/i915/gem_ctx_exec.c b/tests/i915/gem_ctx_exec.c
index b552edfbd..6b0092250 100644
--- a/tests/i915/gem_ctx_exec.c
+++ b/tests/i915/gem_ctx_exec.c
@@ -207,6 +207,7 @@ static void nohangcheck_hostile(int i915)
 {
 	int64_t timeout = NSEC_PER_SEC / 2;
 	igt_spin_t *spin;
+	igt_hang_t hang;
 	uint32_t ctx;
 	int err = 0;
 	int dir;
@@ -216,6 +217,8 @@ static void nohangcheck_hostile(int i915)
 	 * we forcibly terminate that context.
 	 */
 
+	hang = igt_allow_hang(i915, 0, 0);
+
 	dir = igt_sysfs_open_parameters(i915);
 	igt_require(dir != -1);
 
@@ -235,6 +238,7 @@ static void nohangcheck_hostile(int i915)
 
 	igt_require(__enable_hangcheck(dir, true));
 	gem_quiescent_gpu(i915);
+	igt_disallow_hang(i915, hang);
 
 	igt_assert_f(err == 0,
 		     "Hostile unpreemptable context was not cancelled immediately upon closure\n");
-- 
2.24.0.rc1



More information about the igt-dev mailing list