From 2ed5d33ae6be568cb646a47fa1d03acc759552d4 Mon Sep 17 00:00:00 2001 From: Mika Kuoppala Date: Tue, 3 Feb 2015 10:46:02 +0200 Subject: [PATCH] drm/i915: Don't bail out early on i915_handle_error If we bail out from handling the error, we never wake up the waiters, resulting in a stuck processes. This regression was introduced in: commit b8d24a06568368076ebd5a858a011699a97bfa42 Author: Mika Kuoppala Date: Wed Jan 28 17:03:14 2015 +0200 drm/i915: Remove nested work in gpu error handling References: https://bugs.freedesktop.org/show_bug.cgi?id=88933 Signed-off-by: Mika Kuoppala --- drivers/gpu/drm/i915/i915_irq.c | 3 --- 1 file changed, 3 deletions(-) diff --git a/drivers/gpu/drm/i915/i915_irq.c b/drivers/gpu/drm/i915/i915_irq.c index 53c5f9e..4145d95 100644 --- a/drivers/gpu/drm/i915/i915_irq.c +++ b/drivers/gpu/drm/i915/i915_irq.c @@ -2612,9 +2612,6 @@ void i915_handle_error(struct drm_device *dev, bool wedged, va_list args; char error_msg[80]; - if (WARN_ON(mutex_is_locked(&dev_priv->dev->struct_mutex))) - return; - va_start(args, fmt); vscnprintf(error_msg, sizeof(error_msg), fmt, args); va_end(args); -- 1.9.1