---

yaml --- r: 260191 b: refs/heads/master c: 6fe5a7e h: refs/heads/master i: 260189: 46b1cd0 260187: 2302778 260183: 1bde7cf 260175: dae7fa9 260159: c5774c1 v: v3
git-mirror · Jul 7, 2011 · e6c3fc6 · e6c3fc6
1 parent 471a61a
commit e6c3fc6
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: bc67f799e7667fb3c00286f2415c3cc44a253aec
+refs/heads/master: 6fe5a7e3cac5b60774186a95bbb7555fa604080c
diff --git a/trunk/drivers/gpu/drm/i915/i915_drv.c b/trunk/drivers/gpu/drm/i915/i915_drv.c
@@ -580,6 +580,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 */