Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit ea117b8d authored by Joonas Lahtinen's avatar Joonas Lahtinen
Browse files

drm/i915: Reset ILK during GEM sanitization 



ILK should survive a reset without display corruption.

Suggested-by: default avatarChris Wilson <chris@chris-wilson.co.uk>
Signed-off-by: default avatarJoonas 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: default avatarChris Wilson <chris@chris-wilson.co.uk>
parent f2e4d76e

drivers/gpu/drm/i915/i915_gem.c

+2 −3
Original line number Diff line number Diff line
@@ -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);

	}