]> asedeno.scripts.mit.edu Git - linux.git/commit
drm/i915/gt: Make intel_ring_unpin() safe for concurrent pint
authorChris Wilson <chris@chris-wilson.co.uk>
Mon, 18 Nov 2019 23:02:40 +0000 (23:02 +0000)
committerChris Wilson <chris@chris-wilson.co.uk>
Tue, 19 Nov 2019 15:12:46 +0000 (15:12 +0000)
commita266bf42006004306dd48a9082c35dfbff153307
tree27a511edac47243c18a786500abf58b15910e7f7
parentb6422694c5853f7a4faf00431c9d7b5368138152
drm/i915/gt: Make intel_ring_unpin() safe for concurrent pint

In order to avoid some nasty mutex inversions, commit 09c5ab384f6f
("drm/i915: Keep rings pinned while the context is active") allowed the
intel_ring unpinning to be run concurrently with the next context
pinning it. Thus each step in intel_ring_unpin() needed to be atomic and
ordered in a nice onion with intel_ring_pin() so that the lifetimes
overlapped and were always safe.

Sadly, a few steps in intel_ring_unpin() were overlooked, such as
closing the read/write pointers of the ring and discarding the
intel_ring.vaddr, as these steps were not serialised with
intel_ring_pin() and so could leave the ring in disarray.

Fixes: 09c5ab384f6f ("drm/i915: Keep rings pinned while the context is active")
Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
Cc: Mika Kuoppala <mika.kuoppala@linux.intel.com>
Cc: Tvrtko Ursulin <tvrtko.ursulin@intel.com>
Reviewed-by: Tvrtko Ursulin <tvrtko.ursulin@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20191118230254.2615942-6-chris@chris-wilson.co.uk
drivers/gpu/drm/i915/gt/intel_ring.c