[14/37] drm/i915: Detects hangs, but do not reset for SNB

Commit Message

Chris Wilson March 10, 2010, 10:45 p.m. UTC

None

Patch

diff --git a/drivers/gpu/drm/i915/i915_irq.c b/drivers/gpu/drm/i915/i915_irq.c
index 3b6f78c..393bf96 100644
--- a/drivers/gpu/drm/i915/i915_irq.c
+++ b/drivers/gpu/drm/i915/i915_irq.c
@@ -419,7 +419,7 @@  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 (IS_I965G(dev)) {
+		if (IS_I965G(dev) && !IS_GEN6(dev)) {
 			DRM_DEBUG_DRIVER("resetting chip\n");
 			kobject_uevent_env(&dev->primary->kdev.kobj, KOBJ_CHANGE, reset_event);
 			if (!i965_reset(dev, GDRST_RENDER)) {
@@ -1300,10 +1300,6 @@  void i915_hangcheck_elapsed(unsigned long data)
 	drm_i915_private_t *dev_priv = dev->dev_private;
 	uint32_t acthd;
 
-	/* No reset support on this chip yet. */
-	if (IS_GEN6(dev))
-		return;
-
 	if (!IS_I965G(dev))
 		acthd = I915_READ(ACTHD);
 	else