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>
This commit is contained in:
Joonas Lahtinen 2017-04-28 10:53:38 +03:00
Родитель f2e4d76ec2
Коммит ea117b8ddc
1 изменённых файлов: 2 добавлений и 3 удалений

Просмотреть файл

@ -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 * try to take over. The only way to remove the earlier state
* is by resetting. However, resetting on earlier gen is tricky as * is by resetting. However, resetting on earlier gen is tricky as
* it may impact the display and we are uncertain about the stability * it may impact the display and we are uncertain about the stability
* of the reset, so we only reset recent machines with logical * of the reset, so this could be applied to even earlier gen.
* context support (that must be reset to remove any stray contexts).
*/ */
if (INTEL_GEN(i915) >= 6) { if (INTEL_GEN(i915) >= 5) {
int reset = intel_gpu_reset(i915, ALL_ENGINES); int reset = intel_gpu_reset(i915, ALL_ENGINES);
WARN_ON(reset && reset != -ENODEV); WARN_ON(reset && reset != -ENODEV);
} }