summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGordon Ross <gordon.w.ross@gmail.com>2017-02-14 21:32:43 -0500
committerGordon Ross <gordon.w.ross@gmail.com>2017-02-15 20:12:36 -0500
commit7164db27a8fbf944d9aef7d0a7d321ec51999ef8 (patch)
treedcbe94b6b04f06151c67b648fecc9e366238bbb1
parentb3d9a9881acd16ae14de23ab7f72939265980909 (diff)
downloadillumos-gfx-drm-7164db27a8fbf944d9aef7d0a7d321ec51999ef8.tar.gz
7716 drm hang with ring dumps in messages
Reviewed by: Aurlien Larcher <aurelien.larcher@gmail.com> Reviewed by: Richard Lowe <richlowe@richlowe.net>
-rw-r--r--usr/src/uts/intel/io/i915/i915_dma.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/usr/src/uts/intel/io/i915/i915_dma.c b/usr/src/uts/intel/io/i915/i915_dma.c
index 04dff42..0556c12 100644
--- a/usr/src/uts/intel/io/i915/i915_dma.c
+++ b/usr/src/uts/intel/io/i915/i915_dma.c
@@ -1489,7 +1489,7 @@ int i915_driver_load(struct drm_device *dev, unsigned long flags)
if (HAS_POWER_WELL(dev))
i915_init_power_well(dev);
- if (IS_GEN7(dev))
+ if (IS_GEN6(dev) || IS_GEN7(dev))
i915_try_reset = true;
dev_priv->gpu_hang = 0;