3 files changed, 16 insertions, 19 deletions

diff --git a/drivers/gpu/drm/i915/i915_drv.c b/drivers/gpu/drm/i915/i915_drv.c
index 38e889bfd99..2ddac06d596 100644
--- a/drivers/gpu/drm/i915/i915_drv.c
+++ b/drivers/gpu/drm/i915/i915_drv.c
@@ -368,7 +368,7 @@ static int ironlake_do_reset(struct drm_device *dev, u8 flags)
  *   - re-init interrupt state
  *   - re-init display
  */
-int i965_reset(struct drm_device *dev, u8 flags)
+int i915_reset(struct drm_device *dev, u8 flags)
 {
         drm_i915_private_t *dev_priv = dev->dev_private;
         /*
@@ -401,14 +401,19 @@ int i965_reset(struct drm_device *dev, u8 flags)
          * well as the reset bit (GR/bit 0).  Setting the GR bit
          * triggers the reset; when done, the hardware will clear it.
          */
-        if (IS_IRONLAKE(dev))
+        ret = -ENODEV;
+        switch (INTEL_INFO(dev)->gen) {
+        case 5:
                 ret = ironlake_do_reset(dev, flags);
-        else
+                break;
+        case 4:
                 ret = i965_do_reset(dev, flags);
+                break;
+        }
         if (ret) {
-                WARN(true, "i915: Failed to reset chip\n");
+                DRM_ERROR("Failed to reset chip.\n");
                 mutex_unlock(&dev->struct_mutex);
-                return -EIO;
+                return ret;
         }
 
         /* Ok, now get things going again... */
diff --git a/drivers/gpu/drm/i915/i915_drv.h b/drivers/gpu/drm/i915/i915_drv.h
index ae05008a590..b57e049a462 100644
--- a/drivers/gpu/drm/i915/i915_drv.h
+++ b/drivers/gpu/drm/i915/i915_drv.h
@@ -874,7 +874,7 @@ extern long i915_compat_ioctl(struct file *filp, unsigned int cmd,
 extern int i915_emit_box(struct drm_device *dev,
                          struct drm_clip_rect *boxes,
                          int i, int DR1, int DR4);
-extern int i965_reset(struct drm_device *dev, u8 flags);
+extern int i915_reset(struct drm_device *dev, u8 flags);
 extern unsigned long i915_chipset_val(struct drm_i915_private *dev_priv);
 extern unsigned long i915_mch_val(struct drm_i915_private *dev_priv);
 extern unsigned long i915_gfx_val(struct drm_i915_private *dev_priv);
diff --git a/drivers/gpu/drm/i915/i915_irq.c b/drivers/gpu/drm/i915/i915_irq.c
index a5197e13d94..b1e7655288d 100644
--- a/drivers/gpu/drm/i915/i915_irq.c
+++ b/drivers/gpu/drm/i915/i915_irq.c
@@ -397,19 +397,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)) {
-                switch (INTEL_INFO(dev)->gen) {
-                case 5:
-                case 4:
-                        DRM_DEBUG_DRIVER("resetting chip\n");
-                        kobject_uevent_env(&dev->primary->kdev.kobj, KOBJ_CHANGE, reset_event);
-                        if (!i965_reset(dev, GRDOM_RENDER)) {
-                                atomic_set(&dev_priv->mm.wedged, 0);
-                                kobject_uevent_env(&dev->primary->kdev.kobj, KOBJ_CHANGE, reset_done_event);
-                        }
-                        break;
-                default:
-                        DRM_DEBUG_DRIVER("reboot required\n");
-                        break;
+                DRM_DEBUG_DRIVER("resetting chip\n");
+                kobject_uevent_env(&dev->primary->kdev.kobj, KOBJ_CHANGE, reset_event);
+                if (!i915_reset(dev, GRDOM_RENDER)) {
+                        atomic_set(&dev_priv->mm.wedged, 0);
+                        kobject_uevent_env(&dev->primary->kdev.kobj, KOBJ_CHANGE, reset_done_event);
                 }
         }
 }