From def00442d5b9cbe6ca18ead23d80e8501d3fd517 Mon Sep 17 00:00:00 2001 From: Chris Wilson Date: Sat, 26 Oct 2019 20:33:54 +0100 Subject: i915/gem_ctx_exec: Enable resets for basic-nohangcheck Wrap the test inside igt_allow_hang as we depend upon a fast reset to cancel the hostile context. Signed-off-by: Chris Wilson Acked-by: Andi Shyti --- tests/i915/gem_ctx_exec.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) (limited to 'tests/i915/gem_ctx_exec.c') diff --git a/tests/i915/gem_ctx_exec.c b/tests/i915/gem_ctx_exec.c index b552edfb..6c2cd922 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; @@ -220,6 +221,7 @@ static void nohangcheck_hostile(int i915) igt_require(dir != -1); ctx = gem_context_create(i915); + hang = igt_allow_hang(i915, ctx, 0); igt_require(__enable_hangcheck(dir, false)); @@ -233,8 +235,9 @@ static void nohangcheck_hostile(int i915) igt_spin_free(i915, spin); - igt_require(__enable_hangcheck(dir, true)); + __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"); -- cgit v1.2.3