[Intel-gfx] [PATCH 1/5] drm/i915: Do a full device reset after being wedged

[Joonas Lahtinen]

Quoting Chris Wilson (2018-09-03 11:33:33)
> We only call unset_wedged on the global reset path (since it's a global
> operation), so if we are terminally wedged and wish to reset, take the
> full device reset path rather than the quicker individual engine resets.
> 
> Signed-off-by: Chris Wilson <chris at chris-wilson.co.uk>

<SNIP>

> +++ b/drivers/gpu/drm/i915/i915_irq.c
> @@ -3309,7 +3309,8 @@ void i915_handle_error(struct drm_i915_private *dev_priv,
>          * Try engine reset when available. We fall back to full reset if
>          * single reset fails.
>          */
> -       if (intel_has_reset_engine(dev_priv)) {
> +       if (intel_has_reset_engine(dev_priv) &&
> +           !i915_terminally_wedged(&dev_priv->gpu_error)) {

NOT terminally wedged AND can reset individually reads clearer, but
either way:

Reviewed-by: Joonas Lahtinen <joonas.lahtinen at linux.intel.com>

Regards, Joonas