drm/i915: Remove waiting & retiring from shrinker paths

Browse source

i915_gem_wait_for_idle() and i915_retire_requests() introduce a
dependency on the timeline->mutex. This is problematic as we want to
later perform allocations underneath i915_active.mutex, forming a link
between the shrinker, the timeline and active mutexes. Nip this cycle in
the bud by removing the acquisition of the timeline mutex (i.e.
retiring) from inside the shrinker.

Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
Reviewed-by: Matthew Auld <matthew.auld@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20190621183801.23252-1-chris@chris-wilson.co.uk

...

This commit is contained in:

Chris Wilson 2019-06-21 19:37:57 +01:00

parent 2ae70d28f2

commit 9e9539800d

4 changed files with 4 additions and 14 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

10

drivers/gpu/drm/i915/gem/i915_gem_shrinker.c

View file

3

drivers/gpu/drm/i915/gem/selftests/i915_gem_context.c

View file

2

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

View file

3

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

View file