On completion of a banned context, scrub the context image so that we do
not replay the active payload. The intent is that we skip banned
payloads on request submission so that the timeline advancement
continues on in the background. However, if we are returning to a
preempted request, i915_request_skip() is ineffective and instead we
need to patch up the context image so that it continues from the start
of the next request.
Signed-off-by: Chris Wilson <ch...@chris-wilson.co.uk>
---
drivers/gpu/drm/i915/gt/intel_lrc.c | 53 +++++++++++++++++++++++++++++
1 file changed, 53 insertions(+)
diff --git a/drivers/gpu/drm/i915/gt/intel_lrc.c
b/drivers/gpu/drm/i915/gt/intel_lrc.c
index 5a6f1b1ddefa..7280fe32e7e6 100644
--- a/drivers/gpu/drm/i915/gt/intel_lrc.c
+++ b/drivers/gpu/drm/i915/gt/intel_lrc.c
@@ -233,6 +233,9 @@ static void execlists_init_reg_state(u32 *reg_state,
struct intel_context *ce,
struct intel_engine_cs *engine,
struct intel_ring *ring);
+static void
+__execlists_update_reg_state(struct intel_context *ce,
+ struct intel_engine_cs *engine);
static void mark_eio(struct i915_request *rq)
{
@@ -606,6 +609,53 @@ static void kick_siblings(struct i915_request *rq, struct
intel_context *ce)
tasklet_schedule(&ve->base.execlists.tasklet);
}
+static void mark_complete(struct i915_request *rq,
+ struct intel_engine_cs *engine)
+{
+ const struct list_head * const list = &rq->timeline->requests;
+
+ *(u32 *)rq->timeline->hwsp_seqno = rq->fence.seqno;
+ GEM_BUG_ON(!i915_request_completed(rq));
+
+ list_for_each_entry_from_reverse(rq, list, link) {
+ if (i915_request_signaled(rq))
+ break;
+
+ mark_eio(rq);
+ }
+
+ intel_engine_queue_breadcrumbs(engine);
+}
+
+static void cancel_active(struct i915_request *rq,
+ struct intel_engine_cs *engine)
+{
+ struct intel_context * const ce = rq->hw_context;
+ u32 *regs = ce->lrc_reg_state;
+
+ if (i915_request_completed(rq))
+ return;
+
+ GEM_TRACE("%s(%s): { rq=%llx:%lld }\n",
+ __func__, engine->name, rq->fence.context, rq->fence.seqno);
+
+ /* Scrub the context image to prevent replaying the previous batch */
+ memcpy(regs, /* skip restoring the vanilla PPHWSP */
+ engine->pinned_default_state + LRC_STATE_PN * PAGE_SIZE,
+ engine->context_size - PAGE_SIZE);
+ execlists_init_reg_state(regs, ce, engine, ce->ring);
+
+ /* Ring will be advanced on retire; here we need to reset the context */
+ ce->ring->head = intel_ring_wrap(ce->ring, rq->wa_tail);
+ __execlists_update_reg_state(ce, engine);
+
+ /* We've switched away, so this should be a no-op, but intent matters */
+ ce->lrc_desc |= CTX_DESC_FORCE_RESTORE;
+
+ /* Let everyone know that the request may now be retired */
+ mark_complete(rq, engine);
+}
+
static inline void
__execlists_schedule_out(struct i915_request *rq,
struct intel_engine_cs * const engine)
@@ -616,6 +666,9 @@ __execlists_schedule_out(struct i915_request *rq,
execlists_context_status_change(rq, INTEL_CONTEXT_SCHEDULE_OUT);
intel_gt_pm_put(engine->gt);
+ if (unlikely(i915_gem_context_is_banned(ce->gem_context)))
+ cancel_active(rq, engine);
+
/*
* If this is part of a virtual engine, its next request may
* have been blocked waiting for access to the active context.
--
2.23.0
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
