From fb817cd37bcd5192d5749d464129a31c7bb852e5 Mon Sep 17 00:00:00 2001 From: Chris Wilson Date: Fri, 25 Oct 2019 00:25:25 +0100 Subject: i915/gem_ctx_exec: Restore i915.enable_hangcheck before failing If the test fails, don't abort leaving the global i915.enable_hangcheck still disabled as that may affect later tests. Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=112118 Signed-off-by: Chris Wilson Reviewed-by: Joonas Lahtinen --- tests/i915/gem_ctx_exec.c | 14 +++++++++++--- 1 file changed, 11 insertions(+), 3 deletions(-) (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 92e89986..3c344b73 100644 --- a/tests/i915/gem_ctx_exec.c +++ b/tests/i915/gem_ctx_exec.c @@ -209,6 +209,7 @@ static void nohangcheck_hostile(int i915) igt_spin_t *spin; uint32_t ctx; int dir; + int err; /* * Even if the user disables hangcheck during their context, @@ -225,12 +226,19 @@ static void nohangcheck_hostile(int i915) spin = igt_spin_new(i915, ctx, .flags = IGT_SPIN_NO_PREEMPTION); gem_context_destroy(i915, ctx); - igt_assert_eq(gem_wait(i915, spin->handle, &timeout), 0); - - igt_require(__enable_hangcheck(dir, true)); + if (gem_wait(i915, spin->handle, &timeout)) { + igt_debugfs_dump(i915, "i915_engine_info"); + err = -ETIME; + } igt_spin_free(i915, spin); + + igt_require(__enable_hangcheck(dir, true)); gem_quiescent_gpu(i915); + + igt_assert_f(err == 0, + "Hostile unpreemptable context was not cancelled immediately upon closure\n"); + close(dir); } -- cgit v1.2.3