diff options
| author | Chris Wilson <chris@chris-wilson.co.uk> | 2019-08-19 08:58:19 +0100 |
|---|---|---|
| committer | Chris Wilson <chris@chris-wilson.co.uk> | 2019-08-19 10:12:23 +0100 |
| commit | d67739268cf0ee928cdc5e8224090c59efacd653 (patch) | |
| tree | 75324d9b48a47246d177528f0e6678a5c6843d32 /drivers | |
| parent | 6a736ebf314a0b0813bae248ad3daa9154463798 (diff) | |
drm/i915/gt: Mark up the nested engine-pm timeline lock as irqsafe
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: 6c69a45445af ("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
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/gpu/drm/i915/gt/intel_engine_pm.c | 18 |
1 files changed, 18 insertions, 0 deletions
diff --git a/drivers/gpu/drm/i915/gt/intel_engine_pm.c b/drivers/gpu/drm/i915/gt/intel_engine_pm.c index 5f03f7dcad72..a372d4ea9370 100644 --- a/drivers/gpu/drm/i915/gt/intel_engine_pm.c +++ b/drivers/gpu/drm/i915/gt/intel_engine_pm.c @@ -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; |