drm/i915: Mark up the calling context for intel_wakeref_put()
Previously, we assumed we could use mutex_trylock() within an atomic context, falling back to a worker if contended. However, such trickery is illegal inside interrupt context, and so we need to always use a worker under such circumstances. As we normally are in process context, we can typically use a plain mutex, and only defer to a work when we know we are being called from an interrupt path. Fixes: 51fbd8de ("drm/i915/pmu: Atomically acquire the gt_pm wakeref") References: a0855d24 ("locking/mutex: Complain upon mutex API misuse in IRQ contexts") References: https://bugs.freedesktop.org/show_bug.cgi?id=111626 Signed-off-by:Chris Wilson <chris@chris-wilson.co.uk> Cc: Tvrtko Ursulin <tvrtko.ursulin@intel.com> Reviewed-by:
Tvrtko Ursulin <tvrtko.ursulin@intel.com> Link: https://patchwork.freedesktop.org/patch/msgid/20191120125433.3767149-1-chris@chris-wilson.co.uk
Showing
- drivers/gpu/drm/i915/gt/intel_engine_pm.c 2 additions, 1 deletiondrivers/gpu/drm/i915/gt/intel_engine_pm.c
- drivers/gpu/drm/i915/gt/intel_engine_pm.h 10 additions, 0 deletionsdrivers/gpu/drm/i915/gt/intel_engine_pm.h
- drivers/gpu/drm/i915/gt/intel_gt_pm.c 0 additions, 1 deletiondrivers/gpu/drm/i915/gt/intel_gt_pm.c
- drivers/gpu/drm/i915/gt/intel_gt_pm.h 5 additions, 0 deletionsdrivers/gpu/drm/i915/gt/intel_gt_pm.h
- drivers/gpu/drm/i915/gt/intel_lrc.c 1 addition, 1 deletiondrivers/gpu/drm/i915/gt/intel_lrc.c
- drivers/gpu/drm/i915/gt/intel_reset.c 1 addition, 1 deletiondrivers/gpu/drm/i915/gt/intel_reset.c
- drivers/gpu/drm/i915/gt/selftest_engine_pm.c 4 additions, 3 deletionsdrivers/gpu/drm/i915/gt/selftest_engine_pm.c
- drivers/gpu/drm/i915/i915_active.c 3 additions, 2 deletionsdrivers/gpu/drm/i915/i915_active.c
- drivers/gpu/drm/i915/i915_pmu.c 3 additions, 3 deletionsdrivers/gpu/drm/i915/i915_pmu.c
- drivers/gpu/drm/i915/intel_wakeref.c 4 additions, 4 deletionsdrivers/gpu/drm/i915/intel_wakeref.c
- drivers/gpu/drm/i915/intel_wakeref.h 21 additions, 9 deletionsdrivers/gpu/drm/i915/intel_wakeref.h
Loading
Please register or sign in to comment