diff options
| author | Chris Wilson | 2018-12-03 12:36:59 +0100 |
|---|---|---|
| committer | Chris Wilson | 2018-12-03 13:26:04 +0100 |
| commit | f81ff31cb47162a748fc4cccb7bf3a01f2b6f2f0 (patch) | |
| tree | 6060d8aa07532469cf233017742a2c8a233bd301 /drivers/gpu/drm/i915/selftests/intel_hangcheck.c | |
| parent | drm/i915/ringbuffer: Clear semaphore sync registers on ring init (diff) | |
| download | kernel-qcow2-linux-f81ff31cb47162a748fc4cccb7bf3a01f2b6f2f0.tar.gz kernel-qcow2-linux-f81ff31cb47162a748fc4cccb7bf3a01f2b6f2f0.tar.xz kernel-qcow2-linux-f81ff31cb47162a748fc4cccb7bf3a01f2b6f2f0.zip | |
drm/i915/selftests: Terminate hangcheck sanitycheck forcibly
If all else fails and we are stuck eternally waiting for the undying
request, abandon all hope.
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/20181203113701.12106-6-chris@chris-wilson.co.uk
Diffstat (limited to 'drivers/gpu/drm/i915/selftests/intel_hangcheck.c')
| -rw-r--r-- | drivers/gpu/drm/i915/selftests/intel_hangcheck.c | 12 |
1 files changed, 9 insertions, 3 deletions
diff --git a/drivers/gpu/drm/i915/selftests/intel_hangcheck.c b/drivers/gpu/drm/i915/selftests/intel_hangcheck.c index defe671130ab..a48fbe2557ea 100644 --- a/drivers/gpu/drm/i915/selftests/intel_hangcheck.c +++ b/drivers/gpu/drm/i915/selftests/intel_hangcheck.c @@ -308,6 +308,7 @@ static int igt_hang_sanitycheck(void *arg) goto unlock; for_each_engine(engine, i915, id) { + struct igt_wedge_me w; long timeout; if (!intel_engine_can_store_dword(engine)) @@ -328,9 +329,14 @@ static int igt_hang_sanitycheck(void *arg) i915_request_add(rq); - timeout = i915_request_wait(rq, - I915_WAIT_LOCKED, - MAX_SCHEDULE_TIMEOUT); + timeout = 0; + igt_wedge_on_timeout(&w, i915, HZ / 10 /* 100ms timeout*/) + timeout = i915_request_wait(rq, + I915_WAIT_LOCKED, + MAX_SCHEDULE_TIMEOUT); + if (i915_terminally_wedged(&i915->gpu_error)) + timeout = -EIO; + i915_request_put(rq); if (timeout < 0) { |