From: Kenneth Graunke Date: Thu, 7 Jul 2011 22:33:26 +0000 (-0700) Subject: drm/i915: Enable GPU reset on Ivybridge. X-Git-Tag: v3.0~44^2~3 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=1083694ab052e5ba38a8f9a057c4745448977837;p=profile%2Fivi%2Fkernel-adaptation-intel-automotive.git drm/i915: Enable GPU reset on Ivybridge. According to the hardware documentation, GDRST is exactly the same as on Sandybridge. So simply enable the existing code. Signed-off-by: Kenneth Graunke Signed-off-by: Keith Packard --- diff --git a/drivers/gpu/drm/i915/i915_drv.c b/drivers/gpu/drm/i915/i915_drv.c index 013d304..58222e8 100644 --- a/drivers/gpu/drm/i915/i915_drv.c +++ b/drivers/gpu/drm/i915/i915_drv.c @@ -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 */