mirrors/linux-stable
1
0
Fork 0
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git synced 2024-10-07 17:19:02 +00:00
Code Issues Releases Wiki Activity

drm/i915/gt: Mark up the nested engine-pm timeline lock as irqsafe

Browse source 
We use a fake timeline->mutex lock to reassure lockdep that the timeline
is always locked when emitting requests. However, the use inside
__engine_park() may be inside hardirq and so lockdep now complains about
the mixed irq-state of the nested locked. Disable irqs around the
lockdep tracking to keep it happy.

Fixes: 6c69a45445 ("drm/i915/gt: Mark context->active_count as protected by timeline->mutex")
Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
Cc: Tvrtko Ursulin <tvrtko.ursulin@intel.com>
Cc: Mika Kuoppala <mika.kuoppala@linux.intel.com>
Reviewed-by: Mika Kuoppala <mika.kuoppala@linux.intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20190819075835.20065-3-chris@chris-wilson.co.uk
This commit is contained in:
Chris Wilson 2019-08-19 08:58:19 +01:00
parent 6a736ebf31
commit d67739268c
1 changed files with 18 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
drivers/gpu/drm/i915/gt/intel_engine_pm.c
View file

@ -37,9 +37,15 @@ static int __engine_unpark(struct intel_wakeref *wf)
return 0;
}
#if IS_ENABLED(CONFIG_LOCKDEP)
static inline void __timeline_mark_lock(struct intel_context *ce)
{
unsigned long flags;
local_irq_save(flags);
mutex_acquire(&ce->timeline->mutex.dep_map, 2, 0, _THIS_IP_);
local_irq_restore(flags);
}
static inline void __timeline_mark_unlock(struct intel_context *ce)
@ -47,6 +53,18 @@ static inline void __timeline_mark_unlock(struct intel_context *ce)
mutex_release(&ce->timeline->mutex.dep_map, 0, _THIS_IP_);
}
#else
static inline void __timeline_mark_lock(struct intel_context *ce)
{
}
static inline void __timeline_mark_unlock(struct intel_context *ce)
{
}
#endif /* !IS_ENABLED(CONFIG_LOCKDEP) */
static bool switch_to_kernel_context(struct intel_engine_cs *engine)
{
struct i915_request *rq;