drm/i915: Hold irq-off for the entire fake lock period

Browse source

Sadly lockdep records when the irqs are re-enabled and then marks up the
fake lock as being irq-unsafe. Our hand is forced and so we must mark up
the entire fake lock critical section as irq-off.

Hopefully this is the last tweak required!

v2: Not quite, we need to mark the timeline spinlock as irqsafe. That
was a genuine bug being hidden by the earlier lockdep splat.

Fixes: d67739268c ("drm/i915/gt: Mark up the nested engine-pm timeline lock as irqsafe")
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/20190823132700.25286-2-chris@chris-wilson.co.uk
(cherry picked from commit 6dcb85a0ad)
Signed-off-by: Rodrigo Vivi <rodrigo.vivi@intel.com>

...

This commit is contained in:

Chris Wilson 2019-08-23 14:26:46 +01:00 • committed by Rodrigo Vivi

parent 0ac072cced

commit ff36c5c4fd

5 changed files with 42 additions and 29 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download patch file Download diff file Expand all files Collapse all files

28

drivers/gpu/drm/i915/gt/intel_engine_pm.c

View file

9

drivers/gpu/drm/i915/gt/intel_reset.c

View file

10

drivers/gpu/drm/i915/gt/intel_timeline.c

View file

15

drivers/gpu/drm/i915/i915_gem.c

View file

9

drivers/gpu/drm/i915/i915_request.c

View file