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

Commit 2399a4a6 authored by Chris Wilson's avatar Chris Wilson
Browse files

drm/i915: Allow init_breadcrumbs to be used from irq context 



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: default avatarChris Wilson <chris@chris-wilson.co.uk>
Reviewed-by: default avatarTvrtko Ursulin <tvrtko.ursulin@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20180518090212.5349-3-chris@chris-wilson.co.uk
parent fe0c4935

drivers/gpu/drm/i915/intel_breadcrumbs.c

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



	spin_unlock_irq(&b->irq_lock);

	spin_unlock_irqrestore(&b->irq_lock, flags);

}



void intel_engine_fini_breadcrumbs(struct intel_engine_cs *engine)