Chris Wilson <chris@xxxxxxxxxxxxxxxxxx> writes:
> From: Tvrtko Ursulin <tvrtko.ursulin@xxxxxxxxx>
>
> Sentinels are supposed to be last reqeusts in the elsp queue, not the
> only one, so adjust the assert accordingly.
s/reqeusts/requests
>
> Signed-off-by: Tvrtko Ursulin <tvrtko.ursulin@xxxxxxxxx>
> ---
> drivers/gpu/drm/i915/gt/intel_lrc.c | 14 +++-----------
> 1 file changed, 3 insertions(+), 11 deletions(-)
>
> diff --git a/drivers/gpu/drm/i915/gt/intel_lrc.c b/drivers/gpu/drm/i915/gt/intel_lrc.c
> index d55a5e0466e5..db8a170b0e5c 100644
> --- a/drivers/gpu/drm/i915/gt/intel_lrc.c
> +++ b/drivers/gpu/drm/i915/gt/intel_lrc.c
> @@ -1635,9 +1635,9 @@ assert_pending_valid(const struct intel_engine_execlists *execlists,
> ccid = ce->lrc.ccid;
>
> /*
> - * Sentinels are supposed to be lonely so they flush the
> - * current exection off the HW. Check that they are the
> - * only request in the pending submission.
> + * Sentinels are supposed to be the last request so they flush
> + * the current exection off the HW. Check that they are the only
s/exection/exeqution
Reviewed-by: Mika Kuoppala <mika.kuoppala@xxxxxxxxxxxxxxx>
> + * request in the pending submission.
> */
> if (sentinel) {
> GEM_TRACE_ERR("%s: context:%llx after sentinel in pending[%zd]\n",
> @@ -1646,15 +1646,7 @@ assert_pending_valid(const struct intel_engine_execlists *execlists,
> port - execlists->pending);
> return false;
> }
> -
> sentinel = i915_request_has_sentinel(rq);
> - if (sentinel && port != execlists->pending) {
> - GEM_TRACE_ERR("%s: sentinel context:%llx not in prime position[%zd]\n",
> - engine->name,
> - ce->timeline->fence_context,
> - port - execlists->pending);
> - return false;
> - }
>
> /* Hold tightly onto the lock to prevent concurrent retires! */
> if (!spin_trylock_irqsave(&rq->lock, flags))
> --
> 2.20.1
>
> _______________________________________________
> Intel-gfx mailing list
> Intel-gfx@xxxxxxxxxxxxxxxxxxxxx
> https://lists.freedesktop.org/mailman/listinfo/intel-gfx
_______________________________________________
Intel-gfx mailing list
Intel-gfx@xxxxxxxxxxxxxxxxxxxxx
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
