From 8aaee6a84770deea161b2a9a1d1d9b829bc88256 Mon Sep 17 00:00:00 2001 From: Chris Wilson Date: Mon, 24 Mar 2014 17:56:36 +0000 Subject: [PATCH] drm/i915: Mark device as wedged if we fail to resume Reported-by: Jiri Kosina References: https://bugs.freedesktop.org/show_bug.cgi?id=76554 Signed-off-by: Chris Wilson --- drivers/gpu/drm/i915/i915_drv.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/drivers/gpu/drm/i915/i915_drv.c b/drivers/gpu/drm/i915/i915_drv.c index 8a644b17f0ba..b84bb6bd97f3 100644 --- a/drivers/gpu/drm/i915/i915_drv.c +++ b/drivers/gpu/drm/i915/i915_drv.c @@ -565,6 +565,8 @@ static int __i915_drm_thaw(struct drm_device *dev, bool restore_gtt_mappings) mutex_lock(&dev->struct_mutex); error = i915_gem_init_hw(dev); + if (error) + atomic_set_mask(I915_WEDGED, &dev_priv->gpu_error.reset_counter); mutex_unlock(&dev->struct_mutex); /* We need working interrupts for modeset enabling ... */ -- 1.9.1