Merge branch 'drm-intel-fixes' into drm-intel-next

git-mirror · Jul 7, 2011 · 6fe5a7e · 6fe5a7e
2 parents bc67f79 + 1083694
commit 6fe5a7e
Showing 1 changed file with 1 addition and 0 deletions.
diff --git a/drivers/gpu/drm/i915/i915_drv.c b/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 */