Re: [PATCH 08/19] drm/i915: Allow init_breadcrumbs to be used from irq context

[Tvrtko Ursulin <tvrtko.ursulin@linux.intel.com>]

On 17/05/2018 08:40, Chris Wilson wrote:
> In order to support engine reset from irq (timer) context, we need to be
> able to re-initialise the breadcrumbs. So we need to promote the plain
> spin_lock_irq to a safe spin_lock_irqsave.
> 
> Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
> ---
>   drivers/gpu/drm/i915/intel_breadcrumbs.c | 5 +++--
>   1 file changed, 3 insertions(+), 2 deletions(-)
> 
> diff --git a/drivers/gpu/drm/i915/intel_breadcrumbs.c b/drivers/gpu/drm/i915/intel_breadcrumbs.c
> index 18e643df523e..86a987b8ac66 100644
> --- a/drivers/gpu/drm/i915/intel_breadcrumbs.c
> +++ b/drivers/gpu/drm/i915/intel_breadcrumbs.c
> @@ -846,8 +846,9 @@ static void cancel_fake_irq(struct intel_engine_cs *engine)
>   void intel_engine_reset_breadcrumbs(struct intel_engine_cs *engine)
>   {
>   	struct intel_breadcrumbs *b = &engine->breadcrumbs;
> +	unsigned long flags;
>   
> -	spin_lock_irq(&b->irq_lock);
> +	spin_lock_irqsave(&b->irq_lock, flags);
>   
>   	/*
>   	 * Leave the fake_irq timer enabled (if it is running), but clear the
> @@ -871,7 +872,7 @@ void intel_engine_reset_breadcrumbs(struct intel_engine_cs *engine)
>   	 */
>   	clear_bit(ENGINE_IRQ_BREADCRUMB, &engine->irq_posted);

Could demote them to __clear_bit but that's not new in this patch.

>   
> -	spin_unlock_irq(&b->irq_lock);
> +	spin_unlock_irqrestore(&b->irq_lock, flags);
>   }
>   
>   void intel_engine_fini_breadcrumbs(struct intel_engine_cs *engine)
> 

Reviewed-by: Tvrtko Ursulin <tvrtko.ursulin@intel.com>

Regards,

Tvrtko
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx