Quoting Chris Wilson (2019-10-09 17:09:06)
> The active/pending execlists is no longer protected by the
> engine->active.lock, but is serialised by the tasklet instead. Update
> the locking around the debug and stats to follow suit.
>
> v2: local_bh_disable() to prevent recursing into the tasklet in case we
> trigger a softirq (Tvrtko)
>
> Fixes: df403069029d ("drm/i915/execlists: Lift process_csb() out of the irq-off spinlock")
> Signed-off-by: Chris Wilson <chris@xxxxxxxxxxxxxxxxxx>
> Cc: Mika Kuoppala <mika.kuoppala@xxxxxxxxxxxxxxx>
> Cc: Tvrtko Ursulin <tvrtko.ursulin@xxxxxxxxx>
> ---
> drivers/gpu/drm/i915/gt/intel_engine.h | 14 ++++++++++++++
> drivers/gpu/drm/i915/gt/intel_engine_cs.c | 16 +++++++---------
> drivers/gpu/drm/i915/i915_gem.h | 6 ++++++
> 3 files changed, 27 insertions(+), 9 deletions(-)
>
> diff --git a/drivers/gpu/drm/i915/gt/intel_engine.h b/drivers/gpu/drm/i915/gt/intel_engine.h
> index d624752f2a92..fa770d3ca208 100644
> --- a/drivers/gpu/drm/i915/gt/intel_engine.h
> +++ b/drivers/gpu/drm/i915/gt/intel_engine.h
> @@ -136,6 +136,20 @@ execlists_active(const struct intel_engine_execlists *execlists)
> return READ_ONCE(*execlists->active);
> }
>
> +static inline void
> +execlists_active_lock(struct intel_engine_execlists *execlists)
execlists_active_bh_lock() to include the clue about bh_disable?
> +{
> + local_bh_disable(); /* prevent local softirq and lock recursion */
> + tasklet_lock(&execlists->tasklet);
> +}
_______________________________________________
Intel-gfx mailing list
Intel-gfx@xxxxxxxxxxxxxxxxxxxxx
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
