Commit 5d031f4e authored Oct 12, 2017 by Chris Wilson

drm/i915: Stop asserting on set-wedged vs nop_submit_request ordering

Since the removal of the stop_machine(), it is allowed and expected for
the nop_submit_request() and nop_complete_submit_request() to run in
parallel to the i915_gem_set_wedged() processing. As such we can no
longer assert that i915_gem_set_wedged() has completed inside the
stop_machine prior to the individual nop_submit_request execution.

Fixes: af7a8ffa ("drm/i915: Use rcu instead of stop_machine in set_wedged")
Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
Cc: Daniel Vetter <daniel.vetter@intel.com>
Cc: Mika Kuoppala <mika.kuoppala@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20171012204019.3557-1-chris@chris-wilson.co.uk

Reviewed-by: Daniel Vetter <daniel.vetter@intel.com>
Reviewed-by: Mika Kuoppala <mika.kuoppala@intel.com>

parent 15d05f0e

drivers/gpu/drm/i915/i915_gem.c

+0 −2

Original line number	Diff line number	Diff line
		@@ -3087,7 +3087,6 @@ void i915_gem_reset_finish(struct drm_i915_private *dev_priv)

		static void nop_submit_request(struct drm_i915_gem_request *request)
		{
		GEM_BUG_ON(!i915_terminally_wedged(&request->i915->gpu_error));
		dma_fence_set_error(&request->fence, -EIO);

		i915_gem_request_submit(request);
		@@ -3097,7 +3096,6 @@ static void nop_complete_submit_request(struct drm_i915_gem_request *request)
		{
		unsigned long flags;

		GEM_BUG_ON(!i915_terminally_wedged(&request->i915->gpu_error));
		dma_fence_set_error(&request->fence, -EIO);

		spin_lock_irqsave(&request->engine->timeline->lock, flags);