diff options
| author | Chris Wilson | 2018-05-18 11:02:12 +0200 |
|---|---|---|
| committer | Chris Wilson | 2018-05-19 13:50:58 +0200 |
| commit | 2399a4a6f5dff645d7890135db1c965592e1b8f3 (patch) | |
| tree | a1f2fb5e7de7db618a23f54dc20ed81d97c7671e /drivers/gpu/drm/i915/intel_breadcrumbs.c | |
| parent | drm/i915/execlists: Handle copying default context state for atomic reset (diff) | |
| download | kernel-qcow2-linux-2399a4a6f5dff645d7890135db1c965592e1b8f3.tar.gz kernel-qcow2-linux-2399a4a6f5dff645d7890135db1c965592e1b8f3.tar.xz kernel-qcow2-linux-2399a4a6f5dff645d7890135db1c965592e1b8f3.zip | |
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: Chris Wilson <chris@chris-wilson.co.uk>
Reviewed-by: Tvrtko Ursulin <tvrtko.ursulin@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20180518090212.5349-3-chris@chris-wilson.co.uk
Diffstat (limited to 'drivers/gpu/drm/i915/intel_breadcrumbs.c')
| -rw-r--r-- | drivers/gpu/drm/i915/intel_breadcrumbs.c | 5 |
1 files 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); - spin_unlock_irq(&b->irq_lock); + spin_unlock_irqrestore(&b->irq_lock, flags); } void intel_engine_fini_breadcrumbs(struct intel_engine_cs *engine) |