drm/i915: Mark manually wedged engines as guilty

Use the incoming value from debugfs/i915_wedged to select which engines
to marked as guilty in order to force us to reset those requests
(required to quickly bypass simulated hangs).

Testcase: igt/gem_exec_capture
Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
Cc: Mika Kuoppala <mika.kuoppala@linux.intel.com>
Link: http://patchwork.freedesktop.org/patch/msgid/20170325134735.30581-1-chris@chris-wilson.co.uk
Reviewed-by: Mika Kuoppala <mika.kuoppala@linux.intel.com>

diff --git a/drivers/gpu/drm/i915/i915_debugfs.c b/drivers/gpu/drm/i915/i915_debugfs.c
index 3ebdbc798f33bfb6c866e30a4376ce2538074345..316bc47a8eea06d0e89453da732405ce1ee4d755 100644 (file)
--- a/drivers/gpu/drm/i915/i915_debugfs.c
+++ b/drivers/gpu/drm/i915/i915_debugfs.c
@@ -4126,7 +4126,9 @@ i915_wedged_get(void *data, u64 *val)
 static int
 i915_wedged_set(void *data, u64 val)
 {
-       struct drm_i915_private *dev_priv = data;
+       struct drm_i915_private *i915 = data;
+       struct intel_engine_cs *engine;
+       unsigned int tmp;
 
        /*
         * There is no safeguard against this debugfs entry colliding
@@ -4136,13 +4138,17 @@ i915_wedged_set(void *data, u64 val)
         * while it is writing to 'i915_wedged'
         */
 
-       if (i915_reset_backoff(&dev_priv->gpu_error))
+       if (i915_reset_backoff(&i915->gpu_error))
                return -EAGAIN;
 
-       i915_handle_error(dev_priv, val,
-                         "Manually setting wedged to %llu", val);
+       for_each_engine_masked(engine, i915, val, tmp) {
+               engine->hangcheck.seqno = intel_engine_get_seqno(engine);
+               engine->hangcheck.stalled = true;
+       }
+
+       i915_handle_error(i915, val, "Manually setting wedged to %llu", val);
 
-       wait_on_bit(&dev_priv->gpu_error.flags,
+       wait_on_bit(&i915->gpu_error.flags,
                    I915_RESET_HANDOFF,
                    TASK_UNINTERRUPTIBLE);