| Message ID | 20200115175829.2761329-1-chris@chris-wilson.co.uk (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | drm/i915/execlists: Leave resetting ring to intel_ring | expand |
Chris Wilson <chris@chris-wilson.co.uk> writes: > 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 0725d9a31869 ("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: Matthew Brost <matthew.brost@intel.com> > Fixes: 841350223816 ("drm/i915/gt: Drop mutex serialisation between context pin/unpin") > References: 0725d9a31869 ("drm/i915/gt: Make intel_ring_unpin() safe for concurrent pint") > Signed-off-by: Chris 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> > --- > drivers/gpu/drm/i915/gt/intel_lrc.c | 1 - > 1 file changed, 1 deletion(-) > > diff --git a/drivers/gpu/drm/i915/gt/intel_lrc.c b/drivers/gpu/drm/i915/gt/intel_lrc.c > index a8fe2f16c910..999fe82190da 100644 > --- a/drivers/gpu/drm/i915/gt/intel_lrc.c > +++ b/drivers/gpu/drm/i915/gt/intel_lrc.c > @@ -2532,7 +2532,6 @@ static void execlists_context_unpin(struct intel_context *ce) > ce->engine); > > i915_gem_object_unpin_map(ce->state->obj); > - intel_ring_reset(ce->ring, ce->ring->tail); It seems we have entered an era where intel_ring_reset() is actually resetting the ring. Long live the engine(s)! Reviewed-by: Mika Kuoppala <mika.kuoppala@linux.intel.com> > } > > static void > -- > 2.25.0 > > _______________________________________________ > Intel-gfx mailing list > Intel-gfx@lists.freedesktop.org > https://lists.freedesktop.org/mailman/listinfo/intel-gfx
diff --git a/drivers/gpu/drm/i915/gt/intel_lrc.c b/drivers/gpu/drm/i915/gt/intel_lrc.c index a8fe2f16c910..999fe82190da 100644 --- a/drivers/gpu/drm/i915/gt/intel_lrc.c +++ b/drivers/gpu/drm/i915/gt/intel_lrc.c @@ -2532,7 +2532,6 @@ static void execlists_context_unpin(struct intel_context *ce) ce->engine); i915_gem_object_unpin_map(ce->state->obj); - intel_ring_reset(ce->ring, ce->ring->tail); } static void
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 0725d9a31869 ("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: Matthew Brost <matthew.brost@intel.com> Fixes: 841350223816 ("drm/i915/gt: Drop mutex serialisation between context pin/unpin") References: 0725d9a31869 ("drm/i915/gt: Make intel_ring_unpin() safe for concurrent pint") Signed-off-by: Chris 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> --- drivers/gpu/drm/i915/gt/intel_lrc.c | 1 - 1 file changed, 1 deletion(-)