From e6c3fc65538e611b2b50f421a6357ddc17499ce2 Mon Sep 17 00:00:00 2001
From: Keith Packard <keithp@keithp.com>
Date: Thu, 7 Jul 2011 15:39:51 -0700
Subject: [PATCH] --- yaml --- r: 260191 b: refs/heads/master c:
 6fe5a7e3cac5b60774186a95bbb7555fa604080c h: refs/heads/master i:   260189:
 46b1cd0fe94f77c5c6844e20694d46a8efaaab11   260187:
 2302778a4b6dad517736f41212f4ca9b0c058da2   260183:
 1bde7cf681c1288863d07e0bfeff983fabc2f59f   260175:
 dae7fa9ed227222852e0c8b63d7013dc7011f2ef   260159:
 c5774c1b4cfba67eb264ee7e9f6339c1ddc7578c v: v3

---
 [refs]                                | 2 +-
 trunk/drivers/gpu/drm/i915/i915_drv.c | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index 29433a01902c..6f4adc7489a0 100644
--- 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
index 649278fc268b..ec4308d765c5 100644
--- 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 */