---

yaml --- r: 254858 b: refs/heads/master c: 1083694 h: refs/heads/master v: v3
git-mirror · Jul 7, 2011 · 966a3a6 · 966a3a6
1 parent d9c5a6e
commit 966a3a6
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 1 deletion.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: c7ad381078ee1b5ce2ab5274bd5f12fee6e1e59a
+refs/heads/master: 1083694ab052e5ba38a8f9a057c4745448977837
diff --git a/trunk/drivers/gpu/drm/i915/i915_drv.c b/trunk/drivers/gpu/drm/i915/i915_drv.c
@@ -577,6 +577,7 @@ int i915_reset(struct drm_device *dev, u8 flags)
 	if (get_seconds() - dev_priv->last_gpu_reset < 5) {
 		DRM_ERROR("GPU hanging too fast, declaring wedged!\n");
 	} else switch (INTEL_INFO(dev)->gen) {
+	case 7:
 	case 6:
 		ret = gen6_do_reset(dev, flags);
 		/* If reset with a user forcewake, try to restore */