[Intel-gfx] [PATCH] drm/i915: Stop asserting on set-wedged vs nop_submit_request ordering

[Mika Kuoppala]

Chris Wilson <chris at chris-wilson.co.uk> writes:

> 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: af7a8ffad9c5 ("drm/i915: Use rcu instead of stop_machine in set_wedged")
> Signed-off-by: Chris Wilson <chris at chris-wilson.co.uk>
> Cc: Daniel Vetter <daniel.vetter at intel.com>
> Cc: Mika Kuoppala <mika.kuoppala at intel.com>

from irc:
17:12 < danvet> r-b: me

also,

Reviewed-by: Mika Kuoppala <mika.kuoppala at linux.intel.com>

> ---
>  drivers/gpu/drm/i915/i915_gem.c | 2 --
>  1 file changed, 2 deletions(-)
>
> diff --git a/drivers/gpu/drm/i915/i915_gem.c b/drivers/gpu/drm/i915/i915_gem.c
> index 20fcac37c85a..d9d39b309ce8 100644
> --- a/drivers/gpu/drm/i915/i915_gem.c
> +++ b/drivers/gpu/drm/i915/i915_gem.c
> @@ -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);
> -- 
> 2.15.0.rc0
>
> _______________________________________________
> Intel-gfx mailing list
> Intel-gfx at lists.freedesktop.org
> https://lists.freedesktop.org/mailman/listinfo/intel-gfx