Commit f3c0efc9 authored by Chris Wilson's avatar Chris Wilson

drm/i915/execlists: Leave resetting ring to intel_ring

We need to allow concurrent intel_context_unpin, which means avoiding
doing destructive operations like intel_ring_reset(). This was already
fixed for intel_ring_unpin() in commit 0725d9a3 ("drm/i915/gt: Make
intel_ring_unpin() safe for concurrent pint"), but I overlooked that
execlists_context_unpin() also made the same mistake.
Reported-by: default avatarMatthew Brost <matthew.brost@intel.com>
Fixes: 84135022 ("drm/i915/gt: Drop mutex serialisation between context pin/unpin")
References: 0725d9a3 ("drm/i915/gt: Make intel_ring_unpin() safe for concurrent pint")
Signed-off-by: default avatarChris Wilson <chris@chris-wilson.co.uk>
Cc: Matthew Brost <matthew.brost@intel.com>
Cc: Matthew Auld <matthew.auld@intel.com>
Cc: Tvrtko Ursulin <tvrtko.ursulin@intel.com>
Reviewed-by: default avatarMika Kuoppala <mika.kuoppala@linux.intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20200115175829.2761329-1-chris@chris-wilson.co.uk
parent f78d5da6
...@@ -2532,7 +2532,6 @@ static void execlists_context_unpin(struct intel_context *ce) ...@@ -2532,7 +2532,6 @@ static void execlists_context_unpin(struct intel_context *ce)
ce->engine); ce->engine);
i915_gem_object_unpin_map(ce->state->obj); i915_gem_object_unpin_map(ce->state->obj);
intel_ring_reset(ce->ring, ce->ring->tail);
} }
static void static void
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment