drm/i915: move wedged to the other gpu error handling stuff

[deliverable/linux.git] / drivers / gpu / drm / i915 / i915_irq.c

diff --git a/drivers/gpu/drm/i915/i915_irq.c b/drivers/gpu/drm/i915/i915_irq.c
index c768ebdf8a27925c722df29a58a5cb950058222f..f2c0016fa53381522c33c31f7c2745a2008d6c9e 100644 (file)
--- a/drivers/gpu/drm/i915/i915_irq.c
+++ b/drivers/gpu/drm/i915/i915_irq.c
@@ -871,11 +871,11 @@ static void i915_error_work_func(struct work_struct *work)
 
        kobject_uevent_env(&dev->primary->kdev.kobj, KOBJ_CHANGE, error_event);
 
-       if (atomic_read(&dev_priv->mm.wedged)) {
+       if (atomic_read(&dev_priv->gpu_error.wedged)) {
                DRM_DEBUG_DRIVER("resetting chip\n");
                kobject_uevent_env(&dev->primary->kdev.kobj, KOBJ_CHANGE, reset_event);
                if (!i915_reset(dev)) {
-                       atomic_set(&dev_priv->mm.wedged, 0);
+                       atomic_set(&dev_priv->gpu_error.wedged, 0);
                        kobject_uevent_env(&dev->primary->kdev.kobj, KOBJ_CHANGE, reset_done_event);
                }
                complete_all(&dev_priv->gpu_error.completion);
@@ -1483,7 +1483,7 @@ void i915_handle_error(struct drm_device *dev, bool wedged)
 
        if (wedged) {
                INIT_COMPLETION(dev_priv->gpu_error.completion);
-               atomic_set(&dev_priv->mm.wedged, 1);
+               atomic_set(&dev_priv->gpu_error.wedged, 1);
 
                /*
                 * Wakeup waiting processes so they don't hang