| Message ID | 20210201085715.27435-16-chris@chris-wilson.co.uk (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | [01/57] drm/i915/gt: Restrict the GT clock override to just Icelake | expand |
On 01/02/2021 08:56, Chris Wilson wrote: > In the process of preparing to reuse the request submission logic for > other backends, lift it out of the execlists backend. > > While this operates on the common structs, we do have a bit of backend > knowledge, which is harmless for !lrc but still unsightly. > > Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk> > --- > drivers/gpu/drm/i915/gt/intel_engine.h | 3 - > .../drm/i915/gt/intel_execlists_submission.c | 58 ++----------------- > drivers/gpu/drm/i915/gt/intel_lrc_reg.h | 3 + > drivers/gpu/drm/i915/gt/selftest_execlists.c | 2 +- > .../gpu/drm/i915/gt/uc/intel_guc_submission.c | 3 +- > drivers/gpu/drm/i915/i915_scheduler.c | 44 ++++++++++++++ > drivers/gpu/drm/i915/i915_scheduler.h | 3 + > 7 files changed, 56 insertions(+), 60 deletions(-) > > diff --git a/drivers/gpu/drm/i915/gt/intel_engine.h b/drivers/gpu/drm/i915/gt/intel_engine.h > index 8d9184920c51..cc2df80eb449 100644 > --- a/drivers/gpu/drm/i915/gt/intel_engine.h > +++ b/drivers/gpu/drm/i915/gt/intel_engine.h > @@ -137,9 +137,6 @@ execlists_active_unlock_bh(struct intel_engine_execlists *execlists) > local_bh_enable(); /* restore softirq, and kick ksoftirqd! */ > } > > -struct i915_request * > -execlists_unwind_incomplete_requests(struct intel_engine_execlists *execlists); > - > static inline u32 > intel_read_status_page(const struct intel_engine_cs *engine, int reg) > { > diff --git a/drivers/gpu/drm/i915/gt/intel_execlists_submission.c b/drivers/gpu/drm/i915/gt/intel_execlists_submission.c > index 51044387a8a2..b6dea80da533 100644 > --- a/drivers/gpu/drm/i915/gt/intel_execlists_submission.c > +++ b/drivers/gpu/drm/i915/gt/intel_execlists_submission.c > @@ -359,56 +359,6 @@ assert_priority_queue(const struct i915_request *prev, > return rq_prio(prev) >= rq_prio(next); > } > > -static struct i915_request * > -__unwind_incomplete_requests(struct intel_engine_cs *engine) > -{ > - struct i915_request *rq, *rn, *active = NULL; > - struct list_head *pl; > - int prio = I915_PRIORITY_INVALID; > - > - lockdep_assert_held(&engine->active.lock); > - > - list_for_each_entry_safe_reverse(rq, rn, > - &engine->active.requests, > - sched.link) { > - if (__i915_request_is_complete(rq)) { > - list_del_init(&rq->sched.link); > - continue; > - } > - > - __i915_request_unsubmit(rq); > - > - GEM_BUG_ON(rq_prio(rq) == I915_PRIORITY_INVALID); > - if (rq_prio(rq) != prio) { > - prio = rq_prio(rq); > - pl = i915_sched_lookup_priolist(engine, prio); > - } > - GEM_BUG_ON(RB_EMPTY_ROOT(&engine->execlists.queue.rb_root)); > - > - list_move(&rq->sched.link, pl); > - set_bit(I915_FENCE_FLAG_PQUEUE, &rq->fence.flags); > - > - /* Check in case we rollback so far we wrap [size/2] */ > - if (intel_ring_direction(rq->ring, > - rq->tail, > - rq->ring->tail + 8) > 0) > - rq->context->lrc.desc |= CTX_DESC_FORCE_RESTORE; > - > - active = rq; > - } > - > - return active; > -} > - > -struct i915_request * > -execlists_unwind_incomplete_requests(struct intel_engine_execlists *execlists) > -{ > - struct intel_engine_cs *engine = > - container_of(execlists, typeof(*engine), execlists); > - > - return __unwind_incomplete_requests(engine); > -} > - > static void > execlists_context_status_change(struct i915_request *rq, unsigned long status) > { > @@ -1080,7 +1030,7 @@ static void defer_active(struct intel_engine_cs *engine) > { > struct i915_request *rq; > > - rq = __unwind_incomplete_requests(engine); > + rq = __i915_sched_rewind_requests(engine); > if (!rq) > return; > > @@ -1292,7 +1242,7 @@ static void execlists_dequeue(struct intel_engine_cs *engine) > * the preemption, some of the unwound requests may > * complete! > */ > - __unwind_incomplete_requests(engine); > + __i915_sched_rewind_requests(engine); > > last = NULL; > } else if (timeslice_expired(engine, last)) { > @@ -2287,7 +2237,7 @@ static void execlists_capture(struct intel_engine_cs *engine) > * which we return it to the queue for signaling. > * > * By removing them from the execlists queue, we also remove the > - * requests from being processed by __unwind_incomplete_requests() > + * requests from being processed by __intel_engine_rewind_requests() > * during the intel_engine_reset(), and so they will *not* be replayed > * afterwards. > * > @@ -2878,7 +2828,7 @@ static void execlists_reset_rewind(struct intel_engine_cs *engine, bool stalled) > /* Push back any incomplete requests for replay after the reset. */ > rcu_read_lock(); > spin_lock_irqsave(&engine->active.lock, flags); > - __unwind_incomplete_requests(engine); > + __i915_sched_rewind_requests(engine); > spin_unlock_irqrestore(&engine->active.lock, flags); > rcu_read_unlock(); > } > diff --git a/drivers/gpu/drm/i915/gt/intel_lrc_reg.h b/drivers/gpu/drm/i915/gt/intel_lrc_reg.h > index 41e5350a7a05..364656bedec7 100644 > --- a/drivers/gpu/drm/i915/gt/intel_lrc_reg.h > +++ b/drivers/gpu/drm/i915/gt/intel_lrc_reg.h > @@ -92,4 +92,7 @@ > /* in Gen12 ID 0x7FF is reserved to indicate idle */ > #define GEN12_MAX_CONTEXT_HW_ID (GEN11_MAX_CONTEXT_HW_ID - 1) > > +#define CTX_DESC_RELOAD_PD BIT_ULL(1) > +#define CTX_DESC_FORCE_RESTORE BIT_ULL(2) > + > #endif /* _INTEL_LRC_REG_H_ */ > diff --git a/drivers/gpu/drm/i915/gt/selftest_execlists.c b/drivers/gpu/drm/i915/gt/selftest_execlists.c > index 68e1398704a4..73340a96548f 100644 > --- a/drivers/gpu/drm/i915/gt/selftest_execlists.c > +++ b/drivers/gpu/drm/i915/gt/selftest_execlists.c > @@ -4601,7 +4601,7 @@ static int reset_virtual_engine(struct intel_gt *gt, > > /* Fake a preemption event; failed of course */ > spin_lock_irq(&engine->active.lock); > - __unwind_incomplete_requests(engine); > + __i915_sched_rewind_requests(engine); > spin_unlock_irq(&engine->active.lock); > GEM_BUG_ON(rq->engine != engine); > > diff --git a/drivers/gpu/drm/i915/gt/uc/intel_guc_submission.c b/drivers/gpu/drm/i915/gt/uc/intel_guc_submission.c > index dc33e5751776..aecede4f0943 100644 > --- a/drivers/gpu/drm/i915/gt/uc/intel_guc_submission.c > +++ b/drivers/gpu/drm/i915/gt/uc/intel_guc_submission.c > @@ -306,14 +306,13 @@ static void guc_reset_state(struct intel_context *ce, > > static void guc_reset_rewind(struct intel_engine_cs *engine, bool stalled) > { > - struct intel_engine_execlists * const execlists = &engine->execlists; > struct i915_request *rq; > unsigned long flags; > > spin_lock_irqsave(&engine->active.lock, flags); > > /* Push back any incomplete requests for replay after the reset. */ > - rq = execlists_unwind_incomplete_requests(execlists); > + rq = __i915_sched_rewind_requests(engine); > if (!rq) > goto out_unlock; > > diff --git a/drivers/gpu/drm/i915/i915_scheduler.c b/drivers/gpu/drm/i915/i915_scheduler.c > index 5e99f9779309..9fcfbf303ce0 100644 > --- a/drivers/gpu/drm/i915/i915_scheduler.c > +++ b/drivers/gpu/drm/i915/i915_scheduler.c > @@ -6,6 +6,9 @@ > > #include <linux/mutex.h> > > +#include "gt/intel_ring.h" > +#include "gt/intel_lrc_reg.h" > + > #include "i915_drv.h" > #include "i915_globals.h" > #include "i915_request.h" > @@ -542,6 +545,47 @@ void i915_request_enqueue(struct i915_request *rq) > tasklet_hi_schedule(&engine->execlists.tasklet); > } > > +struct i915_request * > +__i915_sched_rewind_requests(struct intel_engine_cs *engine) > +{ > + struct i915_request *rq, *rn, *active = NULL; > + struct list_head *pl; > + int prio = I915_PRIORITY_INVALID; > + > + lockdep_assert_held(&engine->active.lock); > + > + list_for_each_entry_safe_reverse(rq, rn, > + &engine->active.requests, > + sched.link) { > + if (__i915_request_is_complete(rq)) { > + list_del_init(&rq->sched.link); > + continue; > + } > + > + __i915_request_unsubmit(rq); > + > + GEM_BUG_ON(rq_prio(rq) == I915_PRIORITY_INVALID); > + if (rq_prio(rq) != prio) { > + prio = rq_prio(rq); > + pl = i915_sched_lookup_priolist(engine, prio); > + } > + GEM_BUG_ON(RB_EMPTY_ROOT(&engine->execlists.queue.rb_root)); > + > + list_move(&rq->sched.link, pl); > + set_bit(I915_FENCE_FLAG_PQUEUE, &rq->fence.flags); > + > + /* Check in case we rollback so far we wrap [size/2] */ > + if (intel_ring_direction(rq->ring, > + rq->tail, > + rq->ring->tail + 8) > 0) > + rq->context->lrc.desc |= CTX_DESC_FORCE_RESTORE; > + > + active = rq; > + } > + > + return active; > +} > + > void i915_sched_node_init(struct i915_sched_node *node) > { > spin_lock_init(&node->lock); > diff --git a/drivers/gpu/drm/i915/i915_scheduler.h b/drivers/gpu/drm/i915/i915_scheduler.h > index 89d998f226e0..d3984f65b3a6 100644 > --- a/drivers/gpu/drm/i915/i915_scheduler.h > +++ b/drivers/gpu/drm/i915/i915_scheduler.h > @@ -42,6 +42,9 @@ void i915_request_set_priority(struct i915_request *request, int prio); > > void i915_request_enqueue(struct i915_request *request); > > +struct i915_request * > +__i915_sched_rewind_requests(struct intel_engine_cs *engine); > + > struct list_head * > i915_sched_lookup_priolist(struct intel_engine_cs *engine, int prio); > > Reviewed-by: Tvrtko Ursulin <tvrtko.ursulin@intel.com> Regards, Tvrtko
diff --git a/drivers/gpu/drm/i915/gt/intel_engine.h b/drivers/gpu/drm/i915/gt/intel_engine.h index 8d9184920c51..cc2df80eb449 100644 --- a/drivers/gpu/drm/i915/gt/intel_engine.h +++ b/drivers/gpu/drm/i915/gt/intel_engine.h @@ -137,9 +137,6 @@ execlists_active_unlock_bh(struct intel_engine_execlists *execlists) local_bh_enable(); /* restore softirq, and kick ksoftirqd! */ } -struct i915_request * -execlists_unwind_incomplete_requests(struct intel_engine_execlists *execlists); - static inline u32 intel_read_status_page(const struct intel_engine_cs *engine, int reg) { diff --git a/drivers/gpu/drm/i915/gt/intel_execlists_submission.c b/drivers/gpu/drm/i915/gt/intel_execlists_submission.c index 51044387a8a2..b6dea80da533 100644 --- a/drivers/gpu/drm/i915/gt/intel_execlists_submission.c +++ b/drivers/gpu/drm/i915/gt/intel_execlists_submission.c @@ -359,56 +359,6 @@ assert_priority_queue(const struct i915_request *prev, return rq_prio(prev) >= rq_prio(next); } -static struct i915_request * -__unwind_incomplete_requests(struct intel_engine_cs *engine) -{ - struct i915_request *rq, *rn, *active = NULL; - struct list_head *pl; - int prio = I915_PRIORITY_INVALID; - - lockdep_assert_held(&engine->active.lock); - - list_for_each_entry_safe_reverse(rq, rn, - &engine->active.requests, - sched.link) { - if (__i915_request_is_complete(rq)) { - list_del_init(&rq->sched.link); - continue; - } - - __i915_request_unsubmit(rq); - - GEM_BUG_ON(rq_prio(rq) == I915_PRIORITY_INVALID); - if (rq_prio(rq) != prio) { - prio = rq_prio(rq); - pl = i915_sched_lookup_priolist(engine, prio); - } - GEM_BUG_ON(RB_EMPTY_ROOT(&engine->execlists.queue.rb_root)); - - list_move(&rq->sched.link, pl); - set_bit(I915_FENCE_FLAG_PQUEUE, &rq->fence.flags); - - /* Check in case we rollback so far we wrap [size/2] */ - if (intel_ring_direction(rq->ring, - rq->tail, - rq->ring->tail + 8) > 0) - rq->context->lrc.desc |= CTX_DESC_FORCE_RESTORE; - - active = rq; - } - - return active; -} - -struct i915_request * -execlists_unwind_incomplete_requests(struct intel_engine_execlists *execlists) -{ - struct intel_engine_cs *engine = - container_of(execlists, typeof(*engine), execlists); - - return __unwind_incomplete_requests(engine); -} - static void execlists_context_status_change(struct i915_request *rq, unsigned long status) { @@ -1080,7 +1030,7 @@ static void defer_active(struct intel_engine_cs *engine) { struct i915_request *rq; - rq = __unwind_incomplete_requests(engine); + rq = __i915_sched_rewind_requests(engine); if (!rq) return; @@ -1292,7 +1242,7 @@ static void execlists_dequeue(struct intel_engine_cs *engine) * the preemption, some of the unwound requests may * complete! */ - __unwind_incomplete_requests(engine); + __i915_sched_rewind_requests(engine); last = NULL; } else if (timeslice_expired(engine, last)) { @@ -2287,7 +2237,7 @@ static void execlists_capture(struct intel_engine_cs *engine) * which we return it to the queue for signaling. * * By removing them from the execlists queue, we also remove the - * requests from being processed by __unwind_incomplete_requests() + * requests from being processed by __intel_engine_rewind_requests() * during the intel_engine_reset(), and so they will *not* be replayed * afterwards. * @@ -2878,7 +2828,7 @@ static void execlists_reset_rewind(struct intel_engine_cs *engine, bool stalled) /* Push back any incomplete requests for replay after the reset. */ rcu_read_lock(); spin_lock_irqsave(&engine->active.lock, flags); - __unwind_incomplete_requests(engine); + __i915_sched_rewind_requests(engine); spin_unlock_irqrestore(&engine->active.lock, flags); rcu_read_unlock(); } diff --git a/drivers/gpu/drm/i915/gt/intel_lrc_reg.h b/drivers/gpu/drm/i915/gt/intel_lrc_reg.h index 41e5350a7a05..364656bedec7 100644 --- a/drivers/gpu/drm/i915/gt/intel_lrc_reg.h +++ b/drivers/gpu/drm/i915/gt/intel_lrc_reg.h @@ -92,4 +92,7 @@ /* in Gen12 ID 0x7FF is reserved to indicate idle */ #define GEN12_MAX_CONTEXT_HW_ID (GEN11_MAX_CONTEXT_HW_ID - 1) +#define CTX_DESC_RELOAD_PD BIT_ULL(1) +#define CTX_DESC_FORCE_RESTORE BIT_ULL(2) + #endif /* _INTEL_LRC_REG_H_ */ diff --git a/drivers/gpu/drm/i915/gt/selftest_execlists.c b/drivers/gpu/drm/i915/gt/selftest_execlists.c index 68e1398704a4..73340a96548f 100644 --- a/drivers/gpu/drm/i915/gt/selftest_execlists.c +++ b/drivers/gpu/drm/i915/gt/selftest_execlists.c @@ -4601,7 +4601,7 @@ static int reset_virtual_engine(struct intel_gt *gt, /* Fake a preemption event; failed of course */ spin_lock_irq(&engine->active.lock); - __unwind_incomplete_requests(engine); + __i915_sched_rewind_requests(engine); spin_unlock_irq(&engine->active.lock); GEM_BUG_ON(rq->engine != engine); diff --git a/drivers/gpu/drm/i915/gt/uc/intel_guc_submission.c b/drivers/gpu/drm/i915/gt/uc/intel_guc_submission.c index dc33e5751776..aecede4f0943 100644 --- a/drivers/gpu/drm/i915/gt/uc/intel_guc_submission.c +++ b/drivers/gpu/drm/i915/gt/uc/intel_guc_submission.c @@ -306,14 +306,13 @@ static void guc_reset_state(struct intel_context *ce, static void guc_reset_rewind(struct intel_engine_cs *engine, bool stalled) { - struct intel_engine_execlists * const execlists = &engine->execlists; struct i915_request *rq; unsigned long flags; spin_lock_irqsave(&engine->active.lock, flags); /* Push back any incomplete requests for replay after the reset. */ - rq = execlists_unwind_incomplete_requests(execlists); + rq = __i915_sched_rewind_requests(engine); if (!rq) goto out_unlock; diff --git a/drivers/gpu/drm/i915/i915_scheduler.c b/drivers/gpu/drm/i915/i915_scheduler.c index 5e99f9779309..9fcfbf303ce0 100644 --- a/drivers/gpu/drm/i915/i915_scheduler.c +++ b/drivers/gpu/drm/i915/i915_scheduler.c @@ -6,6 +6,9 @@ #include <linux/mutex.h> +#include "gt/intel_ring.h" +#include "gt/intel_lrc_reg.h" + #include "i915_drv.h" #include "i915_globals.h" #include "i915_request.h" @@ -542,6 +545,47 @@ void i915_request_enqueue(struct i915_request *rq) tasklet_hi_schedule(&engine->execlists.tasklet); } +struct i915_request * +__i915_sched_rewind_requests(struct intel_engine_cs *engine) +{ + struct i915_request *rq, *rn, *active = NULL; + struct list_head *pl; + int prio = I915_PRIORITY_INVALID; + + lockdep_assert_held(&engine->active.lock); + + list_for_each_entry_safe_reverse(rq, rn, + &engine->active.requests, + sched.link) { + if (__i915_request_is_complete(rq)) { + list_del_init(&rq->sched.link); + continue; + } + + __i915_request_unsubmit(rq); + + GEM_BUG_ON(rq_prio(rq) == I915_PRIORITY_INVALID); + if (rq_prio(rq) != prio) { + prio = rq_prio(rq); + pl = i915_sched_lookup_priolist(engine, prio); + } + GEM_BUG_ON(RB_EMPTY_ROOT(&engine->execlists.queue.rb_root)); + + list_move(&rq->sched.link, pl); + set_bit(I915_FENCE_FLAG_PQUEUE, &rq->fence.flags); + + /* Check in case we rollback so far we wrap [size/2] */ + if (intel_ring_direction(rq->ring, + rq->tail, + rq->ring->tail + 8) > 0) + rq->context->lrc.desc |= CTX_DESC_FORCE_RESTORE; + + active = rq; + } + + return active; +} + void i915_sched_node_init(struct i915_sched_node *node) { spin_lock_init(&node->lock); diff --git a/drivers/gpu/drm/i915/i915_scheduler.h b/drivers/gpu/drm/i915/i915_scheduler.h index 89d998f226e0..d3984f65b3a6 100644 --- a/drivers/gpu/drm/i915/i915_scheduler.h +++ b/drivers/gpu/drm/i915/i915_scheduler.h @@ -42,6 +42,9 @@ void i915_request_set_priority(struct i915_request *request, int prio); void i915_request_enqueue(struct i915_request *request); +struct i915_request * +__i915_sched_rewind_requests(struct intel_engine_cs *engine); + struct list_head * i915_sched_lookup_priolist(struct intel_engine_cs *engine, int prio);
In the process of preparing to reuse the request submission logic for other backends, lift it out of the execlists backend. While this operates on the common structs, we do have a bit of backend knowledge, which is harmless for !lrc but still unsightly. Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk> --- drivers/gpu/drm/i915/gt/intel_engine.h | 3 - .../drm/i915/gt/intel_execlists_submission.c | 58 ++----------------- drivers/gpu/drm/i915/gt/intel_lrc_reg.h | 3 + drivers/gpu/drm/i915/gt/selftest_execlists.c | 2 +- .../gpu/drm/i915/gt/uc/intel_guc_submission.c | 3 +- drivers/gpu/drm/i915/i915_scheduler.c | 44 ++++++++++++++ drivers/gpu/drm/i915/i915_scheduler.h | 3 + 7 files changed, 56 insertions(+), 60 deletions(-)