---

yaml --- r: 185616 b: refs/heads/master c: b9201c1 h: refs/heads/master v: v3
git-mirror · Feb 26, 2010 · 5bf2acc · 5bf2acc
1 parent ab1d67c
commit 5bf2acc
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 2 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: a13e4093cbd3db91cc65ac8b8c2baadffa603ee9
+refs/heads/master: b9201c14d9c22fb3b3f313f69ee4f967353ca960
diff --git a/trunk/drivers/gpu/drm/i915/i915_irq.c b/trunk/drivers/gpu/drm/i915/i915_irq.c
@@ -1239,7 +1239,11 @@ void i915_hangcheck_elapsed(unsigned long data)
 	struct drm_device *dev = (struct drm_device *)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