mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-09-12 21:57:43 +00:00
789659f430
Missed breadcrumb detection is defunct due to the tight coupling with dma_fence signaling and the myriad ways we may signal fences from everywhere but from an interrupt, i.e. we frequently signal a fence before we even see its interrupt. This means that even if we miss an interrupt for a fence, it still is signaled before our breadcrumb hangcheck fires, so simplify the breadcrumb hangchecking by moving it into the GPU hangcheck and forgo fake interrupts. Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk> Reviewed-by: Tvrtko Ursulin <tvrtko.ursulin@intel.com> Link: https://patchwork.freedesktop.org/patch/msgid/20190129205230.19056-3-chris@chris-wilson.co.uk
78 lines
1.7 KiB
C
78 lines
1.7 KiB
C
/*
|
|
* SPDX-License-Identifier: MIT
|
|
*
|
|
* Copyright © 2018 Intel Corporation
|
|
*/
|
|
|
|
#include "../i915_drv.h"
|
|
|
|
#include "../i915_selftest.h"
|
|
#include "igt_flush_test.h"
|
|
#include "igt_live_test.h"
|
|
|
|
int igt_live_test_begin(struct igt_live_test *t,
|
|
struct drm_i915_private *i915,
|
|
const char *func,
|
|
const char *name)
|
|
{
|
|
struct intel_engine_cs *engine;
|
|
enum intel_engine_id id;
|
|
int err;
|
|
|
|
lockdep_assert_held(&i915->drm.struct_mutex);
|
|
|
|
t->i915 = i915;
|
|
t->func = func;
|
|
t->name = name;
|
|
|
|
err = i915_gem_wait_for_idle(i915,
|
|
I915_WAIT_INTERRUPTIBLE |
|
|
I915_WAIT_LOCKED,
|
|
MAX_SCHEDULE_TIMEOUT);
|
|
if (err) {
|
|
pr_err("%s(%s): failed to idle before, with err=%d!",
|
|
func, name, err);
|
|
return err;
|
|
}
|
|
|
|
t->reset_global = i915_reset_count(&i915->gpu_error);
|
|
|
|
for_each_engine(engine, i915, id)
|
|
t->reset_engine[id] =
|
|
i915_reset_engine_count(&i915->gpu_error, engine);
|
|
|
|
return 0;
|
|
}
|
|
|
|
int igt_live_test_end(struct igt_live_test *t)
|
|
{
|
|
struct drm_i915_private *i915 = t->i915;
|
|
struct intel_engine_cs *engine;
|
|
enum intel_engine_id id;
|
|
|
|
lockdep_assert_held(&i915->drm.struct_mutex);
|
|
|
|
if (igt_flush_test(i915, I915_WAIT_LOCKED))
|
|
return -EIO;
|
|
|
|
if (t->reset_global != i915_reset_count(&i915->gpu_error)) {
|
|
pr_err("%s(%s): GPU was reset %d times!\n",
|
|
t->func, t->name,
|
|
i915_reset_count(&i915->gpu_error) - t->reset_global);
|
|
return -EIO;
|
|
}
|
|
|
|
for_each_engine(engine, i915, id) {
|
|
if (t->reset_engine[id] ==
|
|
i915_reset_engine_count(&i915->gpu_error, engine))
|
|
continue;
|
|
|
|
pr_err("%s(%s): engine '%s' was reset %d times!\n",
|
|
t->func, t->name, engine->name,
|
|
i915_reset_engine_count(&i915->gpu_error, engine) -
|
|
t->reset_engine[id]);
|
|
return -EIO;
|
|
}
|
|
|
|
return 0;
|
|
}
|