Commit ecf73eb2 authored Nov 30, 2017 by Chris Wilson

drm/i915: Skip switch-to-kernel-context on suspend when wedged



If the HW is already wedged, attempting to submit a request will
generate an -EIO. If we tried this during suspend, we would abort
whereas all we want to do is to go sleep and throw away the corrupt
state.

Fixes: 5ab57c70 ("drm/i915: Flush logical context image out to memory upon suspend")
Testcase: igt/gem_eio/suspend
Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
Cc: Mika Kuoppala <mika.kuoppala@linux.intel.com>
Cc: Joonas Lahtinen <joonas.lahtinen@linux.intel.com>
Reviewed-by: Joonas Lahtinen <joonas.lahtinen@linux.intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20171130102951.14965-1-chris@chris-wilson.co.uk

parent 7436830c

drivers/gpu/drm/i915/i915_gem.c

+11 −9

Original line number	Diff line number	Diff line
		@@ -4774,6 +4774,7 @@ int i915_gem_suspend(struct drm_i915_private *dev_priv)
		* state. Fortunately, the kernel_context is disposable and we do
		* not rely on its state.
		*/
		if (!i915_terminally_wedged(&dev_priv->gpu_error)) {
		ret = i915_gem_switch_to_kernel_context(dev_priv);
		if (ret)
		goto err_unlock;
		@@ -4785,6 +4786,7 @@ int i915_gem_suspend(struct drm_i915_private *dev_priv)
		goto err_unlock;

		assert_kernel_context_is_current(dev_priv);
		}
		i915_gem_contexts_lost(dev_priv);
		mutex_unlock(&dev->struct_mutex);

Admin message