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

6fe5a7e3 · Keith Packard · bc67f799 · 1083694a · 6fe5a7e3
Commit 6fe5a7e3 authored Jul 07, 2011 by Keith Packard
Hide whitespace changes
Inline Side-by-side

Showing with 1 addition and 0 deletions

drivers/gpu/drm/i915/i915_drv.c drivers/gpu/drm/i915/i915_drv.c +1 -0

No files found.
--- 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 */