diff options
| author | Joonas Lahtinen <joonas.lahtinen@linux.intel.com> | 2017-04-28 10:53:38 +0300 |
|---|---|---|
| committer | Joonas Lahtinen <joonas.lahtinen@linux.intel.com> | 2017-04-28 12:11:59 +0300 |
| commit | ea117b8ddc9fd36f7aa96df920e9ff9ff5232671 (patch) | |
| tree | f7c7c0c2cc8f1b28093c08787fcb9000ee3360fa | |
| parent | f2e4d76ec2b16e8edcbcf6703f4a64c0ce8178b8 (diff) | |
| download | linux-stable-ea117b8ddc9fd36f7aa96df920e9ff9ff5232671.tar.gz linux-stable-ea117b8ddc9fd36f7aa96df920e9ff9ff5232671.tar.bz2 linux-stable-ea117b8ddc9fd36f7aa96df920e9ff9ff5232671.zip | |
drm/i915: Reset ILK during GEM sanitization
ILK should survive a reset without display corruption.
Suggested-by: Chris Wilson <chris@chris-wilson.co.uk>
Signed-off-by: Joonas Lahtinen <joonas.lahtinen@linux.intel.com>
Cc: Chris Wilson <chris@chris-wilson.co.uk>
Cc: Ville Syrjälä <ville.syrjala@linux.intel.com>
Reviewed-by: Chris Wilson <chris@chris-wilson.co.uk>
| -rw-r--r-- | drivers/gpu/drm/i915/i915_gem.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/drivers/gpu/drm/i915/i915_gem.c b/drivers/gpu/drm/i915/i915_gem.c index ea34a321588d..f5f605740886 100644 --- a/drivers/gpu/drm/i915/i915_gem.c +++ b/drivers/gpu/drm/i915/i915_gem.c @@ -4485,10 +4485,9 @@ void i915_gem_sanitize(struct drm_i915_private *i915) * try to take over. The only way to remove the earlier state * is by resetting. However, resetting on earlier gen is tricky as * it may impact the display and we are uncertain about the stability - * of the reset, so we only reset recent machines with logical - * context support (that must be reset to remove any stray contexts). + * of the reset, so this could be applied to even earlier gen. */ - if (INTEL_GEN(i915) >= 6) { + if (INTEL_GEN(i915) >= 5) { int reset = intel_gpu_reset(i915, ALL_ENGINES); WARN_ON(reset && reset != -ENODEV); } |