From d67739268cf0ee928cdc5e8224090c59efacd653 Mon Sep 17 00:00:00 2001 From: Chris Wilson Date: Mon, 19 Aug 2019 08:58:19 +0100 Subject: [PATCH] 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 Cc: Tvrtko Ursulin Cc: Mika Kuoppala Reviewed-by: Mika Kuoppala Link: https://patchwork.freedesktop.org/patch/msgid/20190819075835.20065-3-chris@chris-wilson.co.uk --- drivers/gpu/drm/i915/gt/intel_engine_pm.c | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) diff --git a/drivers/gpu/drm/i915/gt/intel_engine_pm.c b/drivers/gpu/drm/i915/gt/intel_engine_pm.c index 5f03f7d..a372d4e 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; -- 2.7.4