diff options
| author | Kenneth Graunke <kenneth@whitecape.org> | 2011-07-07 18:33:26 -0400 |
|---|---|---|
| committer | Keith Packard <keithp@keithp.com> | 2011-07-07 18:39:28 -0400 |
| commit | 1083694ab052e5ba38a8f9a057c4745448977837 (patch) | |
| tree | 09d7da8458444a1cc8870f2aeaf7db4c2e339b93 /drivers/gpu/drm/i915/i915_drv.c | |
| parent | c7ad381078ee1b5ce2ab5274bd5f12fee6e1e59a (diff) | |
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/drm/i915/i915_drv.c')
| -rw-r--r-- | drivers/gpu/drm/i915/i915_drv.c | 1 |
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 013d304455b9..58222e86e291 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) | |||
| 577 | if (get_seconds() - dev_priv->last_gpu_reset < 5) { | 577 | if (get_seconds() - dev_priv->last_gpu_reset < 5) { |
| 578 | DRM_ERROR("GPU hanging too fast, declaring wedged!\n"); | 578 | DRM_ERROR("GPU hanging too fast, declaring wedged!\n"); |
| 579 | } else switch (INTEL_INFO(dev)->gen) { | 579 | } else switch (INTEL_INFO(dev)->gen) { |
| 580 | case 7: | ||
| 580 | case 6: | 581 | case 6: |
| 581 | ret = gen6_do_reset(dev, flags); | 582 | ret = gen6_do_reset(dev, flags); |
| 582 | /* If reset with a user forcewake, try to restore */ | 583 | /* If reset with a user forcewake, try to restore */ |