[Intel-gfx] [PATCH 1/3] drm/i915: Trim error mask to known engines

[Chris Wilson]

Quoting Chris Wilson (2018-03-16 21:49:59)
> For the convenience of userspace passing in an arbitrary reset mask,
> remove unknown engines from the set of engines that are to be reset.
> This means that we always follow a per-engine reset with a full-device
> reset when userspace writes -1 into debugfs/i915_wedged.
> 
> Reported-by: Michał Winiarski <michal.winiarski at intel.com>
> Signed-off-by: Chris Wilson <chris at chris-wilson.co.uk>
> Cc: Mika Kuoppala <mika.kuoppala at linux.intel.com>
> Cc: Michał Winiarski <michal.winiarski at intel.com>

Please? It papers over the issue in gem_exec_capture...
-Chris

> ---
>  drivers/gpu/drm/i915/i915_irq.c | 1 +
>  1 file changed, 1 insertion(+)
> 
> diff --git a/drivers/gpu/drm/i915/i915_irq.c b/drivers/gpu/drm/i915/i915_irq.c
> index 828f3104488c..44eef355e12c 100644
> --- a/drivers/gpu/drm/i915/i915_irq.c
> +++ b/drivers/gpu/drm/i915/i915_irq.c
> @@ -2985,6 +2985,7 @@ void i915_handle_error(struct drm_i915_private *dev_priv,
>          */
>         intel_runtime_pm_get(dev_priv);
>  
> +       engine_mask &= INTEL_INFO(dev_priv)->ring_mask;
>         i915_capture_error_state(dev_priv, engine_mask, error_msg);
>         i915_clear_error_registers(dev_priv);
>  
> -- 
> 2.16.2
>