summaryrefslogtreecommitdiffstats
path: root/drivers/gpu
diff options
context:
space:
mode:
authorKenneth Graunke <kenneth@whitecape.org>2011-07-07 15:33:26 -0700
committerKeith Packard <keithp@keithp.com>2011-07-07 15:39:28 -0700
commit1083694ab052e5ba38a8f9a057c4745448977837 (patch)
tree09d7da8458444a1cc8870f2aeaf7db4c2e339b93 /drivers/gpu
parentc7ad381078ee1b5ce2ab5274bd5f12fee6e1e59a (diff)
downloadop-kernel-dev-1083694ab052e5ba38a8f9a057c4745448977837.zip
op-kernel-dev-1083694ab052e5ba38a8f9a057c4745448977837.tar.gz
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 <kenneth@whitecape.org> Signed-off-by: Keith Packard <keithp@keithp.com>
Diffstat (limited to 'drivers/gpu')
-rw-r--r--drivers/gpu/drm/i915/i915_drv.c1
1 files changed, 1 insertions, 0 deletions
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 */
OpenPOWER on IntegriCloud