diff options
| author | Keith Packard <keithp@keithp.com> | 2011-07-07 18:39:51 -0400 |
|---|---|---|
| committer | Keith Packard <keithp@keithp.com> | 2011-07-07 18:39:51 -0400 |
| commit | 6fe5a7e3cac5b60774186a95bbb7555fa604080c (patch) | |
| tree | 5ee9e7b5c553ce4c9dc1c0b7190f405e165787a7 /drivers/gpu | |
| parent | bc67f799e7667fb3c00286f2415c3cc44a253aec (diff) | |
| parent | 1083694ab052e5ba38a8f9a057c4745448977837 (diff) | |
Merge branch 'drm-intel-fixes' into drm-intel-next
Diffstat (limited to 'drivers/gpu')
| -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 649278fc268b..ec4308d765c5 100644 --- a/drivers/gpu/drm/i915/i915_drv.c +++ b/drivers/gpu/drm/i915/i915_drv.c | |||
| @@ -580,6 +580,7 @@ int i915_reset(struct drm_device *dev, u8 flags) | |||
| 580 | if (get_seconds() - dev_priv->last_gpu_reset < 5) { | 580 | if (get_seconds() - dev_priv->last_gpu_reset < 5) { |
| 581 | DRM_ERROR("GPU hanging too fast, declaring wedged!\n"); | 581 | DRM_ERROR("GPU hanging too fast, declaring wedged!\n"); |
| 582 | } else switch (INTEL_INFO(dev)->gen) { | 582 | } else switch (INTEL_INFO(dev)->gen) { |
| 583 | case 7: | ||
| 583 | case 6: | 584 | case 6: |
| 584 | ret = gen6_do_reset(dev, flags); | 585 | ret = gen6_do_reset(dev, flags); |
| 585 | /* If reset with a user forcewake, try to restore */ | 586 | /* If reset with a user forcewake, try to restore */ |