drm/i915/gt: Mark context->active_count as protected by timeline->mutex

Browse source

We use timeline->mutex to protect modifications to
context->active_count, and the associated enable/disable callbacks.
Due to complications with engine-pm barrier there is a path where we used
a "superlock" to provide serialised protect and so could not
unconditionally assert with lockdep that it was always held. However,
we can mark the mutex as taken (noting that we may be nested underneath
ourselves) which means we can be reassured the right timeline->mutex is
always treated as held and let lockdep roam free.

Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
Cc: Tvrtko Ursulin <tvrtko.ursulin@intel.com>
Reviewed-by: Mika Kuoppala <mika.kuoppala@linux.intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20190816121000.8507-1-chris@chris-wilson.co.uk

...

This commit is contained in:

Chris Wilson 2019-08-16 13:09:59 +01:00

parent f789fbb1eb

commit 6c69a45445

5 changed files with 24 additions and 2 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

3

drivers/gpu/drm/i915/gt/intel_context.h

View file

2

drivers/gpu/drm/i915/gt/intel_context_types.h

View file

14

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

View file

4

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

View file

3

drivers/gpu/drm/i915/i915_request.c

View file