From 873d66fb9b1d4f4cd441f84068abb5457c60f127 Mon Sep 17 00:00:00 2001 From: Chris Wilson Date: Fri, 16 Mar 2018 21:49:59 +0000 Subject: [PATCH] drm/i915: Trim error mask to known engines MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit 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 Signed-off-by: Chris Wilson Cc: Mika Kuoppala Cc: Michał Winiarski Link: https://patchwork.freedesktop.org/patch/msgid/20180316215001.12391-1-chris@chris-wilson.co.uk Reviewed-by: Michel Thierry --- 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.11.0