From 7a0edddff31308dd72f101ded26d74055ec09aed Mon Sep 17 00:00:00 2001
From: Chris Wilson <chris@chris-wilson.co.uk>
Date: Fri, 31 Jan 2020 13:03:19 +0000
Subject: drm/i915/selftests: Disable heartbeat around hang tests
Git-commit: b0e02a73c5061515fd68b4c2432adb38c3074f47
Patch-mainline: v5.7-rc1
References: jsc#SLE-12680, jsc#SLE-12880, jsc#SLE-12882, jsc#SLE-12883, jsc#SLE-13496, jsc#SLE-15322
If the heartbeat fires in the middle of the preempt-hang test, it
consumes our forced hang disrupting the test.
Reported-by: Daniel Vetter <daniel.vetter@ffwll.ch>
Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
Reviewed-by: Mika Kuoppala <mika.kuoppala@linux.intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20200131130319.2998318-1-chris@chris-wilson.co.uk
Signed-off-by: Patrik Jakobsson <pjakobsson@suse.de>
---
drivers/gpu/drm/i915/gt/selftest_lrc.c | 10 ++++++++++
1 file changed, 10 insertions(+)
diff --git a/drivers/gpu/drm/i915/gt/selftest_lrc.c b/drivers/gpu/drm/i915/gt/selftest_lrc.c
index f82c77f2ac06..6f0295f18b38 100644
--- a/drivers/gpu/drm/i915/gt/selftest_lrc.c
+++ b/drivers/gpu/drm/i915/gt/selftest_lrc.c
@@ -2465,15 +2465,19 @@ static int live_preempt_hang(void *arg)
I915_USER_PRIORITY(I915_CONTEXT_MIN_USER_PRIORITY);
for_each_engine(engine, gt, id) {
+ unsigned long heartbeat;
struct i915_request *rq;
if (!intel_engine_has_preemption(engine))
continue;
+ engine_heartbeat_disable(engine, &heartbeat);
+
rq = spinner_create_request(&spin_lo, ctx_lo, engine,
MI_ARB_CHECK);
if (IS_ERR(rq)) {
err = PTR_ERR(rq);
+ engine_heartbeat_enable(engine, heartbeat);
goto err_ctx_lo;
}
@@ -2483,6 +2487,7 @@ static int live_preempt_hang(void *arg)
GEM_TRACE_DUMP();
intel_gt_set_wedged(gt);
err = -EIO;
+ engine_heartbeat_enable(engine, heartbeat);
goto err_ctx_lo;
}
@@ -2490,6 +2495,7 @@ static int live_preempt_hang(void *arg)
MI_ARB_CHECK);
if (IS_ERR(rq)) {
igt_spinner_end(&spin_lo);
+ engine_heartbeat_enable(engine, heartbeat);
err = PTR_ERR(rq);
goto err_ctx_lo;
}
@@ -2504,6 +2510,7 @@ static int live_preempt_hang(void *arg)
pr_err("Preemption did not occur within timeout!");
GEM_TRACE_DUMP();
intel_gt_set_wedged(gt);
+ engine_heartbeat_enable(engine, heartbeat);
err = -EIO;
goto err_ctx_lo;
}
@@ -2518,12 +2525,15 @@ static int live_preempt_hang(void *arg)
GEM_TRACE("hi spinner failed to start\n");
GEM_TRACE_DUMP();
intel_gt_set_wedged(gt);
+ engine_heartbeat_enable(engine, heartbeat);
err = -EIO;
goto err_ctx_lo;
}
igt_spinner_end(&spin_hi);
igt_spinner_end(&spin_lo);
+ engine_heartbeat_enable(engine, heartbeat);
+
if (igt_flush_test(gt->i915)) {
err = -EIO;
goto err_ctx_lo;
--
2.28.0