]> asedeno.scripts.mit.edu Git - linux.git/commitdiff
drm/i915: Enable GPU reset on Ivybridge.
authorKenneth Graunke <kenneth@whitecape.org>
Thu, 7 Jul 2011 22:33:26 +0000 (15:33 -0700)
committerKeith Packard <keithp@keithp.com>
Thu, 7 Jul 2011 22:39:28 +0000 (15:39 -0700)
According to the hardware documentation, GDRST is exactly the same as on
Sandybridge.  So simply enable the existing code.

Signed-off-by: Kenneth Graunke <kenneth@whitecape.org>
Signed-off-by: Keith Packard <keithp@keithp.com>
drivers/gpu/drm/i915/i915_drv.c

index 013d304455b9a1c7027af6f3351dbb5cbe8c2359..58222e86e2914710389c45bb796c2751d1f4d671 100644 (file)
@@ -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 */