[05/10] drm/i915/gt: Distinguish the virtual breadcrumbs from the irq breadcrumbs

Message ID	20200720092312.16975-5-chris@chris-wilson.co.uk (mailing list archive)
State	New, archived
Headers	show Return-Path: <SRS0=uigT=A7=lists.freedesktop.org=intel-gfx-bounces@kernel.org> DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 3EDCE2176B From: Chris Wilson <chris@chris-wilson.co.uk> To: intel-gfx@lists.freedesktop.org Date: Mon, 20 Jul 2020 10:23:07 +0100 Message-Id: <20200720092312.16975-5-chris@chris-wilson.co.uk> In-Reply-To: <20200720092312.16975-1-chris@chris-wilson.co.uk> References: <20200720092312.16975-1-chris@chris-wilson.co.uk> MIME-Version: 1.0 Subject: [Intel-gfx] [PATCH 05/10] drm/i915/gt: Distinguish the virtual breadcrumbs from the irq breadcrumbs Precedence: list Cc: Chris Wilson <chris@chris-wilson.co.uk> Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Errors-To: intel-gfx-bounces@lists.freedesktop.org Sender: "Intel-gfx" <intel-gfx-bounces@lists.freedesktop.org>
Series	[01/10] drm/i915/gem: Remove disordered per-file request list for throttling \| expand [01/10] drm/i915/gem: Remove disordered per-file request list for throttling [02/10] drm/i915: Remove requirement for holding i915_request.lock for breadcrumbs [03/10] drm/i915/gt: Replace intel_engine_transfer_stale_breadcrumbs [04/10] drm/i915/gt: Only transfer the virtual context to the new engine if active [05/10] drm/i915/gt: Distinguish the virtual breadcrumbs from the irq breadcrumbs [06/10] drm/i915/gt: Move intel_breadcrumbs_arm_irq earlier [07/10] drm/i915/gt: Hold context/request reference while breadcrumbs are active [08/10] drm/i915/gt: Track signaled breadcrumbs outside of the breadcrumb spinlock [09/10] drm/i915/gt: Split the breadcrumb spinlock between global and contexts [10/10] drm/i915: Drop i915_request.lock serialisation around await_start

On 20/07/2020 10:23, Chris Wilson wrote: > On the virtual engines, we only use the intel_breadcrumbs for tracking > signaling of stale breadcrumbs from the irq_workers. They do not have > any associated interrupt handling, active requests are passed to a > physical engine and associated breadcrumb interrupt handler. This causes > issues for us as we need to ensure that we do not actually try and > enable interrupts and the powermanagement required for them on the > virtual engine, as they will never be disabled. Instead, let's > specify the physical engine used for interrupt handler on a particular > breadcrumb. > > Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk> > Cc: Tvrtko Ursulin <tvrtko.ursulin@intel.com> > --- > drivers/gpu/drm/i915/gt/intel_breadcrumbs.c | 72 ++++++++++--------- > drivers/gpu/drm/i915/gt/intel_breadcrumbs.h | 36 ++++++++++ > .../gpu/drm/i915/gt/intel_breadcrumbs_types.h | 47 ++++++++++++ > drivers/gpu/drm/i915/gt/intel_engine.h | 17 ----- > drivers/gpu/drm/i915/gt/intel_engine_cs.c | 14 +++- > drivers/gpu/drm/i915/gt/intel_engine_pm.c | 3 +- > drivers/gpu/drm/i915/gt/intel_engine_types.h | 31 +------- > drivers/gpu/drm/i915/gt/intel_gt_irq.c | 1 + > drivers/gpu/drm/i915/gt/intel_lrc.c | 11 ++- > drivers/gpu/drm/i915/gt/intel_reset.c | 1 + > .../gpu/drm/i915/gt/intel_ring_submission.c | 3 +- > drivers/gpu/drm/i915/gt/intel_rps.c | 1 + > drivers/gpu/drm/i915/gt/mock_engine.c | 10 ++- > drivers/gpu/drm/i915/i915_irq.c | 1 + > drivers/gpu/drm/i915/i915_request.c | 1 + > drivers/gpu/drm/i915/i915_request.h | 4 -- > 16 files changed, 162 insertions(+), 91 deletions(-) > create mode 100644 drivers/gpu/drm/i915/gt/intel_breadcrumbs.h > create mode 100644 drivers/gpu/drm/i915/gt/intel_breadcrumbs_types.h > > diff --git a/drivers/gpu/drm/i915/gt/intel_breadcrumbs.c b/drivers/gpu/drm/i915/gt/intel_breadcrumbs.c > index fbdc465a5870..621cf9d1d7ad 100644 > --- a/drivers/gpu/drm/i915/gt/intel_breadcrumbs.c > +++ b/drivers/gpu/drm/i915/gt/intel_breadcrumbs.c > @@ -28,6 +28,7 @@ > > #include "i915_drv.h" > #include "i915_trace.h" > +#include "intel_breadcrumbs.h" > #include "intel_gt_pm.h" > #include "intel_gt_requests.h" > > @@ -55,22 +56,21 @@ static void irq_disable(struct intel_engine_cs *engine) > > static void __intel_breadcrumbs_disarm_irq(struct intel_breadcrumbs *b) > { > - struct intel_engine_cs *engine = > - container_of(b, struct intel_engine_cs, breadcrumbs); > - > lockdep_assert_held(&b->irq_lock); > > + if (!b->irq_engine) > + return; > + > GEM_BUG_ON(!b->irq_enabled); > if (!--b->irq_enabled) > - irq_disable(engine); > + irq_disable(b->irq_engine); > > WRITE_ONCE(b->irq_armed, false); > - intel_gt_pm_put_async(engine->gt); > + intel_gt_pm_put_async(b->irq_engine->gt); > } > > -void intel_engine_disarm_breadcrumbs(struct intel_engine_cs *engine) > +void intel_breadcrumbs_park(struct intel_breadcrumbs *b) > { > - struct intel_breadcrumbs *b = &engine->breadcrumbs; > unsigned long flags; > > if (!READ_ONCE(b->irq_armed)) > @@ -133,13 +133,8 @@ __dma_fence_signal__notify(struct dma_fence *fence, > > static void add_retire(struct intel_breadcrumbs *b, struct intel_timeline *tl) > { > - struct intel_engine_cs *engine = > - container_of(b, struct intel_engine_cs, breadcrumbs); > - > - if (unlikely(intel_engine_is_virtual(engine))) > - engine = intel_virtual_engine_get_sibling(engine, 0); > - > - intel_engine_add_retire(engine, tl); > + if (b->irq_engine) > + intel_engine_add_retire(b->irq_engine, tl); > } > > static bool __signal_request(struct i915_request *rq, struct list_head *signals) > @@ -222,14 +217,13 @@ static void signal_irq_work(struct irq_work *work) > > static void __intel_breadcrumbs_arm_irq(struct intel_breadcrumbs *b) > { > - struct intel_engine_cs *engine = > - container_of(b, struct intel_engine_cs, breadcrumbs); > - > lockdep_assert_held(&b->irq_lock); > + > if (b->irq_armed) > return; > > - if (!intel_gt_pm_get_if_awake(engine->gt)) > + GEM_BUG_ON(!b->irq_engine); > + if (!intel_gt_pm_get_if_awake(b->irq_engine->gt)) > return; > > /* > @@ -249,37 +243,51 @@ static void __intel_breadcrumbs_arm_irq(struct intel_breadcrumbs *b) > */ > > if (!b->irq_enabled++) > - irq_enable(engine); > + irq_enable(b->irq_engine); > } > > -void intel_engine_init_breadcrumbs(struct intel_engine_cs *engine) > +struct intel_breadcrumbs * > +intel_breadcrumbs_create(struct intel_engine_cs *irq_engine) > { > - struct intel_breadcrumbs *b = &engine->breadcrumbs; > + struct intel_breadcrumbs *b; > + > + b = kzalloc(sizeof(*b), GFP_KERNEL); > + if (!b) > + return NULL; > > spin_lock_init(&b->irq_lock); > INIT_LIST_HEAD(&b->signalers); > INIT_LIST_HEAD(&b->signaled_requests); > > init_irq_work(&b->irq_work, signal_irq_work); > + > + b->irq_engine = irq_engine; > + if (!irq_engine) > + b->irq_armed = true; /* fake HW, used for irq_work */ Disarm is checking for !b->irq_engine and arm asserts there must be when arming. If instead arm would abort on !b->irq_engine would it all work just as well without the need for this hack? Regards, Tvrtko > + > + return b; > } > > -void intel_engine_reset_breadcrumbs(struct intel_engine_cs *engine) > +void intel_breadcrumbs_reset(struct intel_breadcrumbs *b) > { > - struct intel_breadcrumbs *b = &engine->breadcrumbs; > unsigned long flags; > > + if (!b->irq_engine) > + return; > + > spin_lock_irqsave(&b->irq_lock, flags); > > if (b->irq_enabled) > - irq_enable(engine); > + irq_enable(b->irq_engine); > else > - irq_disable(engine); > + irq_disable(b->irq_engine); > > spin_unlock_irqrestore(&b->irq_lock, flags); > } > > -void intel_engine_fini_breadcrumbs(struct intel_engine_cs *engine) > +void intel_breadcrumbs_free(struct intel_breadcrumbs *b) > { > + kfree(b); > } > > static void insert_breadcrumb(struct i915_request *rq, > @@ -369,11 +377,11 @@ bool i915_request_enable_breadcrumb(struct i915_request *rq) > * request submit/unsubmit path, and so we must be more careful to > * acquire the right lock. > */ > - b = &READ_ONCE(rq->engine)->breadcrumbs; > + b = READ_ONCE(rq->engine)->breadcrumbs; > spin_lock(&b->irq_lock); > - while (unlikely(b != &READ_ONCE(rq->engine)->breadcrumbs)) { > + while (unlikely(b != READ_ONCE(rq->engine)->breadcrumbs)) { > spin_unlock(&b->irq_lock); > - b = &READ_ONCE(rq->engine)->breadcrumbs; > + b = READ_ONCE(rq->engine)->breadcrumbs; > spin_lock(&b->irq_lock); > } > > @@ -394,7 +402,7 @@ bool i915_request_enable_breadcrumb(struct i915_request *rq) > > void i915_request_cancel_breadcrumb(struct i915_request *rq) > { > - struct intel_breadcrumbs *b = &rq->engine->breadcrumbs; > + struct intel_breadcrumbs *b = rq->engine->breadcrumbs; > > /* > * We must wait for b->irq_lock so that we know the interrupt handler > @@ -418,11 +426,11 @@ void i915_request_cancel_breadcrumb(struct i915_request *rq) > void intel_engine_print_breadcrumbs(struct intel_engine_cs *engine, > struct drm_printer *p) > { > - struct intel_breadcrumbs *b = &engine->breadcrumbs; > + struct intel_breadcrumbs *b = engine->breadcrumbs; > struct intel_context *ce; > struct i915_request *rq; > > - if (list_empty(&b->signalers)) > + if (!b || list_empty(&b->signalers)) > return; > > drm_printf(p, "Signals:\n"); > diff --git a/drivers/gpu/drm/i915/gt/intel_breadcrumbs.h b/drivers/gpu/drm/i915/gt/intel_breadcrumbs.h > new file mode 100644 > index 000000000000..0d25f793159e > --- /dev/null > +++ b/drivers/gpu/drm/i915/gt/intel_breadcrumbs.h > @@ -0,0 +1,36 @@ > +/* SPDX-License-Identifier: MIT */ > +/* > + * Copyright © 2019 Intel Corporation > + */ > + > +#ifndef __INTEL_BREADCRUMBS___ > +#define __INTEL_BREADCRUMBS__ > + > +#include <linux/irq_work.h> > + > +#include "intel_engine_types.h" > + > +struct drm_printer; > +struct i915_request; > +struct intel_breadcrumbs; > + > +struct intel_breadcrumbs * > +intel_breadcrumbs_create(struct intel_engine_cs *irq_engine); > +void intel_breadcrumbs_free(struct intel_breadcrumbs *b); > + > +void intel_breadcrumbs_reset(struct intel_breadcrumbs *b); > +void intel_breadcrumbs_park(struct intel_breadcrumbs *b); > + > +static inline void > +intel_engine_signal_breadcrumbs(struct intel_engine_cs *engine) > +{ > + irq_work_queue(&engine->breadcrumbs->irq_work); > +} > + > +void intel_engine_print_breadcrumbs(struct intel_engine_cs *engine, > + struct drm_printer *p); > + > +bool i915_request_enable_breadcrumb(struct i915_request *request); > +void i915_request_cancel_breadcrumb(struct i915_request *request); > + > +#endif /* __INTEL_BREADCRUMBS__ */ > diff --git a/drivers/gpu/drm/i915/gt/intel_breadcrumbs_types.h b/drivers/gpu/drm/i915/gt/intel_breadcrumbs_types.h > new file mode 100644 > index 000000000000..8e53b9942695 > --- /dev/null > +++ b/drivers/gpu/drm/i915/gt/intel_breadcrumbs_types.h > @@ -0,0 +1,47 @@ > +/* SPDX-License-Identifier: MIT */ > +/* > + * Copyright © 2019 Intel Corporation > + */ > + > +#ifndef __INTEL_BREADCRUMBS_TYPES__ > +#define __INTEL_BREADCRUMBS_TYPES__ > + > +#include <linux/irq_work.h> > +#include <linux/list.h> > +#include <linux/spinlock.h> > +#include <linux/types.h> > + > +/* > + * Rather than have every client wait upon all user interrupts, > + * with the herd waking after every interrupt and each doing the > + * heavyweight seqno dance, we delegate the task (of being the > + * bottom-half of the user interrupt) to the first client. After > + * every interrupt, we wake up one client, who does the heavyweight > + * coherent seqno read and either goes back to sleep (if incomplete), > + * or wakes up all the completed clients in parallel, before then > + * transferring the bottom-half status to the next client in the queue. > + * > + * Compared to walking the entire list of waiters in a single dedicated > + * bottom-half, we reduce the latency of the first waiter by avoiding > + * a context switch, but incur additional coherent seqno reads when > + * following the chain of request breadcrumbs. Since it is most likely > + * that we have a single client waiting on each seqno, then reducing > + * the overhead of waking that client is much preferred. > + */ > +struct intel_breadcrumbs { > + spinlock_t irq_lock; /* protects the lists used in hardirq context */ > + > + /* Not all breadcrumbs are attached to physical HW */ > + struct intel_engine_cs *irq_engine; > + > + struct list_head signalers; > + struct list_head signaled_requests; > + > + struct irq_work irq_work; /* for use from inside irq_lock */ > + > + unsigned int irq_enabled; > + > + bool irq_armed; > +}; > + > +#endif /* __INTEL_BREADCRUMBS_TYPES__ */ > diff --git a/drivers/gpu/drm/i915/gt/intel_engine.h b/drivers/gpu/drm/i915/gt/intel_engine.h > index faf00a353e25..08e2c000dcc3 100644 > --- a/drivers/gpu/drm/i915/gt/intel_engine.h > +++ b/drivers/gpu/drm/i915/gt/intel_engine.h > @@ -223,23 +223,6 @@ void intel_engine_get_instdone(const struct intel_engine_cs *engine, > > void intel_engine_init_execlists(struct intel_engine_cs *engine); > > -void intel_engine_init_breadcrumbs(struct intel_engine_cs *engine); > -void intel_engine_fini_breadcrumbs(struct intel_engine_cs *engine); > - > -void intel_engine_disarm_breadcrumbs(struct intel_engine_cs *engine); > - > -static inline void > -intel_engine_signal_breadcrumbs(struct intel_engine_cs *engine) > -{ > - irq_work_queue(&engine->breadcrumbs.irq_work); > -} > - > -void intel_engine_reset_breadcrumbs(struct intel_engine_cs *engine); > -void intel_engine_fini_breadcrumbs(struct intel_engine_cs *engine); > - > -void intel_engine_print_breadcrumbs(struct intel_engine_cs *engine, > - struct drm_printer *p); > - > static inline u32 *__gen8_emit_pipe_control(u32 *batch, u32 flags0, u32 flags1, u32 offset) > { > memset(batch, 0, 6 * sizeof(u32)); > diff --git a/drivers/gpu/drm/i915/gt/intel_engine_cs.c b/drivers/gpu/drm/i915/gt/intel_engine_cs.c > index dd1a42c4d344..c20a91c1318f 100644 > --- a/drivers/gpu/drm/i915/gt/intel_engine_cs.c > +++ b/drivers/gpu/drm/i915/gt/intel_engine_cs.c > @@ -28,6 +28,7 @@ > > #include "i915_drv.h" > > +#include "intel_breadcrumbs.h" > #include "intel_context.h" > #include "intel_engine.h" > #include "intel_engine_pm.h" > @@ -700,8 +701,13 @@ static int engine_setup_common(struct intel_engine_cs *engine) > if (err) > return err; > > + engine->breadcrumbs = intel_breadcrumbs_create(engine); > + if (!engine->breadcrumbs) { > + err = -ENOMEM; > + goto err_status; > + } > + > intel_engine_init_active(engine, ENGINE_PHYSICAL); > - intel_engine_init_breadcrumbs(engine); > intel_engine_init_execlists(engine); > intel_engine_init_cmd_parser(engine); > intel_engine_init__pm(engine); > @@ -716,6 +722,10 @@ static int engine_setup_common(struct intel_engine_cs *engine) > intel_engine_init_ctx_wa(engine); > > return 0; > + > +err_status: > + cleanup_status_page(engine); > + return err; > } > > struct measure_breadcrumb { > @@ -902,9 +912,9 @@ void intel_engine_cleanup_common(struct intel_engine_cs *engine) > tasklet_kill(&engine->execlists.tasklet); /* flush the callback */ > > cleanup_status_page(engine); > + intel_breadcrumbs_free(engine->breadcrumbs); > > intel_engine_fini_retire(engine); > - intel_engine_fini_breadcrumbs(engine); > intel_engine_cleanup_cmd_parser(engine); > > if (engine->default_state) > diff --git a/drivers/gpu/drm/i915/gt/intel_engine_pm.c b/drivers/gpu/drm/i915/gt/intel_engine_pm.c > index 8ec3eecf3e39..f7b2e07e2229 100644 > --- a/drivers/gpu/drm/i915/gt/intel_engine_pm.c > +++ b/drivers/gpu/drm/i915/gt/intel_engine_pm.c > @@ -6,6 +6,7 @@ > > #include "i915_drv.h" > > +#include "intel_breadcrumbs.h" > #include "intel_context.h" > #include "intel_engine.h" > #include "intel_engine_heartbeat.h" > @@ -247,7 +248,7 @@ static int __engine_park(struct intel_wakeref *wf) > call_idle_barriers(engine); /* cleanup after wedging */ > > intel_engine_park_heartbeat(engine); > - intel_engine_disarm_breadcrumbs(engine); > + intel_breadcrumbs_park(engine->breadcrumbs); > > /* Must be reset upon idling, or we may miss the busy wakeup. */ > GEM_BUG_ON(engine->execlists.queue_priority_hint != INT_MIN); > diff --git a/drivers/gpu/drm/i915/gt/intel_engine_types.h b/drivers/gpu/drm/i915/gt/intel_engine_types.h > index 8de92fd7d392..c400aaa2287b 100644 > --- a/drivers/gpu/drm/i915/gt/intel_engine_types.h > +++ b/drivers/gpu/drm/i915/gt/intel_engine_types.h > @@ -22,6 +22,7 @@ > #include "i915_pmu.h" > #include "i915_priolist_types.h" > #include "i915_selftest.h" > +#include "intel_breadcrumbs_types.h" > #include "intel_sseu.h" > #include "intel_timeline_types.h" > #include "intel_uncore.h" > @@ -373,34 +374,8 @@ struct intel_engine_cs { > */ > struct ewma__engine_latency latency; > > - /* Rather than have every client wait upon all user interrupts, > - * with the herd waking after every interrupt and each doing the > - * heavyweight seqno dance, we delegate the task (of being the > - * bottom-half of the user interrupt) to the first client. After > - * every interrupt, we wake up one client, who does the heavyweight > - * coherent seqno read and either goes back to sleep (if incomplete), > - * or wakes up all the completed clients in parallel, before then > - * transferring the bottom-half status to the next client in the queue. > - * > - * Compared to walking the entire list of waiters in a single dedicated > - * bottom-half, we reduce the latency of the first waiter by avoiding > - * a context switch, but incur additional coherent seqno reads when > - * following the chain of request breadcrumbs. Since it is most likely > - * that we have a single client waiting on each seqno, then reducing > - * the overhead of waking that client is much preferred. > - */ > - struct intel_breadcrumbs { > - spinlock_t irq_lock; > - struct list_head signalers; > - > - struct list_head signaled_requests; > - > - struct irq_work irq_work; /* for use from inside irq_lock */ > - > - unsigned int irq_enabled; > - > - bool irq_armed; > - } breadcrumbs; > + /* Keep track of all the seqno used, a trail of breadcrumbs */ > + struct intel_breadcrumbs *breadcrumbs; > > struct intel_engine_pmu { > /** > diff --git a/drivers/gpu/drm/i915/gt/intel_gt_irq.c b/drivers/gpu/drm/i915/gt/intel_gt_irq.c > index b05da68e52f4..257063a57101 100644 > --- a/drivers/gpu/drm/i915/gt/intel_gt_irq.c > +++ b/drivers/gpu/drm/i915/gt/intel_gt_irq.c > @@ -8,6 +8,7 @@ > > #include "i915_drv.h" > #include "i915_irq.h" > +#include "intel_breadcrumbs.h" > #include "intel_gt.h" > #include "intel_gt_irq.h" > #include "intel_uncore.h" > diff --git a/drivers/gpu/drm/i915/gt/intel_lrc.c b/drivers/gpu/drm/i915/gt/intel_lrc.c > index 5e8278e8ac79..9112bb07a068 100644 > --- a/drivers/gpu/drm/i915/gt/intel_lrc.c > +++ b/drivers/gpu/drm/i915/gt/intel_lrc.c > @@ -137,6 +137,7 @@ > #include "i915_perf.h" > #include "i915_trace.h" > #include "i915_vgpu.h" > +#include "intel_breadcrumbs.h" > #include "intel_context.h" > #include "intel_engine_pm.h" > #include "intel_gt.h" > @@ -4119,7 +4120,7 @@ static int execlists_resume(struct intel_engine_cs *engine) > { > intel_mocs_init_engine(engine); > > - intel_engine_reset_breadcrumbs(engine); > + intel_breadcrumbs_reset(engine->breadcrumbs); > > if (GEM_SHOW_DEBUG() && unexpected_starting_state(engine)) { > struct drm_printer p = drm_debug_printer(__func__); > @@ -5704,9 +5705,7 @@ intel_execlists_create_virtual(struct intel_engine_cs **siblings, > snprintf(ve->base.name, sizeof(ve->base.name), "virtual"); > > intel_engine_init_active(&ve->base, ENGINE_VIRTUAL); > - intel_engine_init_breadcrumbs(&ve->base); > intel_engine_init_execlists(&ve->base); > - ve->base.breadcrumbs.irq_armed = true; /* fake HW, used for irq_work */ > > ve->base.cops = &virtual_context_ops; > ve->base.request_alloc = execlists_request_alloc; > @@ -5723,6 +5722,12 @@ intel_execlists_create_virtual(struct intel_engine_cs **siblings, > > intel_context_init(&ve->context, &ve->base); > > + ve->base.breadcrumbs = intel_breadcrumbs_create(NULL); > + if (!ve->base.breadcrumbs) { > + err = -ENOMEM; > + goto err_put; > + } > + > for (n = 0; n < count; n++) { > struct intel_engine_cs *sibling = siblings[n]; > > diff --git a/drivers/gpu/drm/i915/gt/intel_reset.c b/drivers/gpu/drm/i915/gt/intel_reset.c > index 46a5ceffc22f..ac36b67fb46b 100644 > --- a/drivers/gpu/drm/i915/gt/intel_reset.c > +++ b/drivers/gpu/drm/i915/gt/intel_reset.c > @@ -15,6 +15,7 @@ > #include "i915_drv.h" > #include "i915_gpu_error.h" > #include "i915_irq.h" > +#include "intel_breadcrumbs.h" > #include "intel_engine_pm.h" > #include "intel_gt.h" > #include "intel_gt_pm.h" > diff --git a/drivers/gpu/drm/i915/gt/intel_ring_submission.c b/drivers/gpu/drm/i915/gt/intel_ring_submission.c > index 94915f668715..186aa2d3a83e 100644 > --- a/drivers/gpu/drm/i915/gt/intel_ring_submission.c > +++ b/drivers/gpu/drm/i915/gt/intel_ring_submission.c > @@ -32,6 +32,7 @@ > #include "gen6_ppgtt.h" > #include "gen7_renderclear.h" > #include "i915_drv.h" > +#include "intel_breadcrumbs.h" > #include "intel_context.h" > #include "intel_gt.h" > #include "intel_reset.h" > @@ -255,7 +256,7 @@ static int xcs_resume(struct intel_engine_cs *engine) > else > ring_setup_status_page(engine); > > - intel_engine_reset_breadcrumbs(engine); > + intel_breadcrumbs_reset(engine->breadcrumbs); > > /* Enforce ordering by reading HEAD register back */ > ENGINE_POSTING_READ(engine, RING_HEAD); > diff --git a/drivers/gpu/drm/i915/gt/intel_rps.c b/drivers/gpu/drm/i915/gt/intel_rps.c > index 97ba14ad52e4..e6a00eea0631 100644 > --- a/drivers/gpu/drm/i915/gt/intel_rps.c > +++ b/drivers/gpu/drm/i915/gt/intel_rps.c > @@ -7,6 +7,7 @@ > #include <drm/i915_drm.h> > > #include "i915_drv.h" > +#include "intel_breadcrumbs.h" > #include "intel_gt.h" > #include "intel_gt_clock_utils.h" > #include "intel_gt_irq.h" > diff --git a/drivers/gpu/drm/i915/gt/mock_engine.c b/drivers/gpu/drm/i915/gt/mock_engine.c > index 06303ba98c19..d1971ffdca42 100644 > --- a/drivers/gpu/drm/i915/gt/mock_engine.c > +++ b/drivers/gpu/drm/i915/gt/mock_engine.c > @@ -261,11 +261,12 @@ static void mock_engine_release(struct intel_engine_cs *engine) > > GEM_BUG_ON(timer_pending(&mock->hw_delay)); > > + intel_breadcrumbs_free(engine->breadcrumbs); > + > intel_context_unpin(engine->kernel_context); > intel_context_put(engine->kernel_context); > > intel_engine_fini_retire(engine); > - intel_engine_fini_breadcrumbs(engine); > } > > struct intel_engine_cs *mock_engine(struct drm_i915_private *i915, > @@ -323,11 +324,14 @@ int mock_engine_init(struct intel_engine_cs *engine) > struct intel_context *ce; > > intel_engine_init_active(engine, ENGINE_MOCK); > - intel_engine_init_breadcrumbs(engine); > intel_engine_init_execlists(engine); > intel_engine_init__pm(engine); > intel_engine_init_retire(engine); > > + engine->breadcrumbs = intel_breadcrumbs_create(NULL); > + if (!engine->breadcrumbs) > + return -ENOMEM; > + > ce = create_kernel_context(engine); > if (IS_ERR(ce)) > goto err_breadcrumbs; > @@ -339,7 +343,7 @@ int mock_engine_init(struct intel_engine_cs *engine) > return 0; > > err_breadcrumbs: > - intel_engine_fini_breadcrumbs(engine); > + intel_breadcrumbs_free(engine->breadcrumbs); > return -ENOMEM; > } > > diff --git a/drivers/gpu/drm/i915/i915_irq.c b/drivers/gpu/drm/i915/i915_irq.c > index 1fa67700d8f4..f113fe44572b 100644 > --- a/drivers/gpu/drm/i915/i915_irq.c > +++ b/drivers/gpu/drm/i915/i915_irq.c > @@ -41,6 +41,7 @@ > #include "display/intel_lpe_audio.h" > #include "display/intel_psr.h" > > +#include "gt/intel_breadcrumbs.h" > #include "gt/intel_gt.h" > #include "gt/intel_gt_irq.h" > #include "gt/intel_gt_pm_irq.h" > diff --git a/drivers/gpu/drm/i915/i915_request.c b/drivers/gpu/drm/i915/i915_request.c > index ada630677cf3..394587e70a2d 100644 > --- a/drivers/gpu/drm/i915/i915_request.c > +++ b/drivers/gpu/drm/i915/i915_request.c > @@ -31,6 +31,7 @@ > #include <linux/sched/signal.h> > > #include "gem/i915_gem_context.h" > +#include "gt/intel_breadcrumbs.h" > #include "gt/intel_context.h" > #include "gt/intel_ring.h" > #include "gt/intel_rps.h" > diff --git a/drivers/gpu/drm/i915/i915_request.h b/drivers/gpu/drm/i915/i915_request.h > index fc18378c685d..16b721080195 100644 > --- a/drivers/gpu/drm/i915/i915_request.h > +++ b/drivers/gpu/drm/i915/i915_request.h > @@ -361,10 +361,6 @@ void i915_request_submit(struct i915_request *request); > void __i915_request_unsubmit(struct i915_request *request); > void i915_request_unsubmit(struct i915_request *request); > > -/* Note: part of the intel_breadcrumbs family */ > -bool i915_request_enable_breadcrumb(struct i915_request *request); > -void i915_request_cancel_breadcrumb(struct i915_request *request); > - > long i915_request_wait(struct i915_request *rq, > unsigned int flags, > long timeout) >

diff --git a/drivers/gpu/drm/i915/gt/intel_breadcrumbs.c b/drivers/gpu/drm/i915/gt/intel_breadcrumbs.c index fbdc465a5870..621cf9d1d7ad 100644 --- a/drivers/gpu/drm/i915/gt/intel_breadcrumbs.c +++ b/drivers/gpu/drm/i915/gt/intel_breadcrumbs.c @@ -28,6 +28,7 @@ #include "i915_drv.h" #include "i915_trace.h" +#include "intel_breadcrumbs.h" #include "intel_gt_pm.h" #include "intel_gt_requests.h" @@ -55,22 +56,21 @@ static void irq_disable(struct intel_engine_cs *engine) static void __intel_breadcrumbs_disarm_irq(struct intel_breadcrumbs *b) { - struct intel_engine_cs *engine = - container_of(b, struct intel_engine_cs, breadcrumbs); - lockdep_assert_held(&b->irq_lock); + if (!b->irq_engine) + return; + GEM_BUG_ON(!b->irq_enabled); if (!--b->irq_enabled) - irq_disable(engine); + irq_disable(b->irq_engine); WRITE_ONCE(b->irq_armed, false); - intel_gt_pm_put_async(engine->gt); + intel_gt_pm_put_async(b->irq_engine->gt); } -void intel_engine_disarm_breadcrumbs(struct intel_engine_cs *engine) +void intel_breadcrumbs_park(struct intel_breadcrumbs *b) { - struct intel_breadcrumbs *b = &engine->breadcrumbs; unsigned long flags; if (!READ_ONCE(b->irq_armed)) @@ -133,13 +133,8 @@ __dma_fence_signal__notify(struct dma_fence *fence, static void add_retire(struct intel_breadcrumbs *b, struct intel_timeline *tl) { - struct intel_engine_cs *engine = - container_of(b, struct intel_engine_cs, breadcrumbs); - - if (unlikely(intel_engine_is_virtual(engine))) - engine = intel_virtual_engine_get_sibling(engine, 0); - - intel_engine_add_retire(engine, tl); + if (b->irq_engine) + intel_engine_add_retire(b->irq_engine, tl); } static bool __signal_request(struct i915_request *rq, struct list_head *signals) @@ -222,14 +217,13 @@ static void signal_irq_work(struct irq_work *work) static void __intel_breadcrumbs_arm_irq(struct intel_breadcrumbs *b) { - struct intel_engine_cs *engine = - container_of(b, struct intel_engine_cs, breadcrumbs); - lockdep_assert_held(&b->irq_lock); + if (b->irq_armed) return; - if (!intel_gt_pm_get_if_awake(engine->gt)) + GEM_BUG_ON(!b->irq_engine); + if (!intel_gt_pm_get_if_awake(b->irq_engine->gt)) return; /* @@ -249,37 +243,51 @@ static void __intel_breadcrumbs_arm_irq(struct intel_breadcrumbs *b) */ if (!b->irq_enabled++) - irq_enable(engine); + irq_enable(b->irq_engine); } -void intel_engine_init_breadcrumbs(struct intel_engine_cs *engine) +struct intel_breadcrumbs * +intel_breadcrumbs_create(struct intel_engine_cs *irq_engine) { - struct intel_breadcrumbs *b = &engine->breadcrumbs; + struct intel_breadcrumbs *b; + + b = kzalloc(sizeof(*b), GFP_KERNEL); + if (!b) + return NULL; spin_lock_init(&b->irq_lock); INIT_LIST_HEAD(&b->signalers); INIT_LIST_HEAD(&b->signaled_requests); init_irq_work(&b->irq_work, signal_irq_work); + + b->irq_engine = irq_engine; + if (!irq_engine) + b->irq_armed = true; /* fake HW, used for irq_work */ + + return b; } -void intel_engine_reset_breadcrumbs(struct intel_engine_cs *engine) +void intel_breadcrumbs_reset(struct intel_breadcrumbs *b) { - struct intel_breadcrumbs *b = &engine->breadcrumbs; unsigned long flags; + if (!b->irq_engine) + return; + spin_lock_irqsave(&b->irq_lock, flags); if (b->irq_enabled) - irq_enable(engine); + irq_enable(b->irq_engine); else - irq_disable(engine); + irq_disable(b->irq_engine); spin_unlock_irqrestore(&b->irq_lock, flags); } -void intel_engine_fini_breadcrumbs(struct intel_engine_cs *engine) +void intel_breadcrumbs_free(struct intel_breadcrumbs *b) { + kfree(b); } static void insert_breadcrumb(struct i915_request *rq, @@ -369,11 +377,11 @@ bool i915_request_enable_breadcrumb(struct i915_request *rq) * request submit/unsubmit path, and so we must be more careful to * acquire the right lock. */ - b = &READ_ONCE(rq->engine)->breadcrumbs; + b = READ_ONCE(rq->engine)->breadcrumbs; spin_lock(&b->irq_lock); - while (unlikely(b != &READ_ONCE(rq->engine)->breadcrumbs)) { + while (unlikely(b != READ_ONCE(rq->engine)->breadcrumbs)) { spin_unlock(&b->irq_lock); - b = &READ_ONCE(rq->engine)->breadcrumbs; + b = READ_ONCE(rq->engine)->breadcrumbs; spin_lock(&b->irq_lock); } @@ -394,7 +402,7 @@ bool i915_request_enable_breadcrumb(struct i915_request *rq) void i915_request_cancel_breadcrumb(struct i915_request *rq) { - struct intel_breadcrumbs *b = &rq->engine->breadcrumbs; + struct intel_breadcrumbs *b = rq->engine->breadcrumbs; /* * We must wait for b->irq_lock so that we know the interrupt handler @@ -418,11 +426,11 @@ void i915_request_cancel_breadcrumb(struct i915_request *rq) void intel_engine_print_breadcrumbs(struct intel_engine_cs *engine, struct drm_printer *p) { - struct intel_breadcrumbs *b = &engine->breadcrumbs; + struct intel_breadcrumbs *b = engine->breadcrumbs; struct intel_context *ce; struct i915_request *rq; - if (list_empty(&b->signalers)) + if (!b || list_empty(&b->signalers)) return; drm_printf(p, "Signals:\n"); diff --git a/drivers/gpu/drm/i915/gt/intel_breadcrumbs.h b/drivers/gpu/drm/i915/gt/intel_breadcrumbs.h new file mode 100644 index 000000000000..0d25f793159e --- /dev/null +++ b/drivers/gpu/drm/i915/gt/intel_breadcrumbs.h @@ -0,0 +1,36 @@ +/* SPDX-License-Identifier: MIT */ +/* + * Copyright © 2019 Intel Corporation + */ + +#ifndef __INTEL_BREADCRUMBS___ +#define __INTEL_BREADCRUMBS__ + +#include <linux/irq_work.h> + +#include "intel_engine_types.h" + +struct drm_printer; +struct i915_request; +struct intel_breadcrumbs; + +struct intel_breadcrumbs * +intel_breadcrumbs_create(struct intel_engine_cs *irq_engine); +void intel_breadcrumbs_free(struct intel_breadcrumbs *b); + +void intel_breadcrumbs_reset(struct intel_breadcrumbs *b); +void intel_breadcrumbs_park(struct intel_breadcrumbs *b); + +static inline void +intel_engine_signal_breadcrumbs(struct intel_engine_cs *engine) +{ + irq_work_queue(&engine->breadcrumbs->irq_work); +} + +void intel_engine_print_breadcrumbs(struct intel_engine_cs *engine, + struct drm_printer *p); + +bool i915_request_enable_breadcrumb(struct i915_request *request); +void i915_request_cancel_breadcrumb(struct i915_request *request); + +#endif /* __INTEL_BREADCRUMBS__ */ diff --git a/drivers/gpu/drm/i915/gt/intel_breadcrumbs_types.h b/drivers/gpu/drm/i915/gt/intel_breadcrumbs_types.h new file mode 100644 index 000000000000..8e53b9942695 --- /dev/null +++ b/drivers/gpu/drm/i915/gt/intel_breadcrumbs_types.h @@ -0,0 +1,47 @@ +/* SPDX-License-Identifier: MIT */ +/* + * Copyright © 2019 Intel Corporation + */ + +#ifndef __INTEL_BREADCRUMBS_TYPES__ +#define __INTEL_BREADCRUMBS_TYPES__ + +#include <linux/irq_work.h> +#include <linux/list.h> +#include <linux/spinlock.h> +#include <linux/types.h> + +/* + * Rather than have every client wait upon all user interrupts, + * with the herd waking after every interrupt and each doing the + * heavyweight seqno dance, we delegate the task (of being the + * bottom-half of the user interrupt) to the first client. After + * every interrupt, we wake up one client, who does the heavyweight + * coherent seqno read and either goes back to sleep (if incomplete), + * or wakes up all the completed clients in parallel, before then + * transferring the bottom-half status to the next client in the queue. + * + * Compared to walking the entire list of waiters in a single dedicated + * bottom-half, we reduce the latency of the first waiter by avoiding + * a context switch, but incur additional coherent seqno reads when + * following the chain of request breadcrumbs. Since it is most likely + * that we have a single client waiting on each seqno, then reducing + * the overhead of waking that client is much preferred. + */ +struct intel_breadcrumbs { + spinlock_t irq_lock; /* protects the lists used in hardirq context */ + + /* Not all breadcrumbs are attached to physical HW */ + struct intel_engine_cs *irq_engine; + + struct list_head signalers; + struct list_head signaled_requests; + + struct irq_work irq_work; /* for use from inside irq_lock */ + + unsigned int irq_enabled; + + bool irq_armed; +}; + +#endif /* __INTEL_BREADCRUMBS_TYPES__ */ diff --git a/drivers/gpu/drm/i915/gt/intel_engine.h b/drivers/gpu/drm/i915/gt/intel_engine.h index faf00a353e25..08e2c000dcc3 100644 --- a/drivers/gpu/drm/i915/gt/intel_engine.h +++ b/drivers/gpu/drm/i915/gt/intel_engine.h @@ -223,23 +223,6 @@ void intel_engine_get_instdone(const struct intel_engine_cs *engine, void intel_engine_init_execlists(struct intel_engine_cs *engine); -void intel_engine_init_breadcrumbs(struct intel_engine_cs *engine); -void intel_engine_fini_breadcrumbs(struct intel_engine_cs *engine); - -void intel_engine_disarm_breadcrumbs(struct intel_engine_cs *engine); - -static inline void -intel_engine_signal_breadcrumbs(struct intel_engine_cs *engine) -{ - irq_work_queue(&engine->breadcrumbs.irq_work); -} - -void intel_engine_reset_breadcrumbs(struct intel_engine_cs *engine); -void intel_engine_fini_breadcrumbs(struct intel_engine_cs *engine); - -void intel_engine_print_breadcrumbs(struct intel_engine_cs *engine, - struct drm_printer *p); - static inline u32 *__gen8_emit_pipe_control(u32 *batch, u32 flags0, u32 flags1, u32 offset) { memset(batch, 0, 6 * sizeof(u32)); diff --git a/drivers/gpu/drm/i915/gt/intel_engine_cs.c b/drivers/gpu/drm/i915/gt/intel_engine_cs.c index dd1a42c4d344..c20a91c1318f 100644 --- a/drivers/gpu/drm/i915/gt/intel_engine_cs.c +++ b/drivers/gpu/drm/i915/gt/intel_engine_cs.c @@ -28,6 +28,7 @@ #include "i915_drv.h" +#include "intel_breadcrumbs.h" #include "intel_context.h" #include "intel_engine.h" #include "intel_engine_pm.h" @@ -700,8 +701,13 @@ static int engine_setup_common(struct intel_engine_cs *engine) if (err) return err; + engine->breadcrumbs = intel_breadcrumbs_create(engine); + if (!engine->breadcrumbs) { + err = -ENOMEM; + goto err_status; + } + intel_engine_init_active(engine, ENGINE_PHYSICAL); - intel_engine_init_breadcrumbs(engine); intel_engine_init_execlists(engine); intel_engine_init_cmd_parser(engine); intel_engine_init__pm(engine); @@ -716,6 +722,10 @@ static int engine_setup_common(struct intel_engine_cs *engine) intel_engine_init_ctx_wa(engine); return 0; + +err_status: + cleanup_status_page(engine); + return err; } struct measure_breadcrumb { @@ -902,9 +912,9 @@ void intel_engine_cleanup_common(struct intel_engine_cs *engine) tasklet_kill(&engine->execlists.tasklet); /* flush the callback */ cleanup_status_page(engine); + intel_breadcrumbs_free(engine->breadcrumbs); intel_engine_fini_retire(engine); - intel_engine_fini_breadcrumbs(engine); intel_engine_cleanup_cmd_parser(engine); if (engine->default_state) diff --git a/drivers/gpu/drm/i915/gt/intel_engine_pm.c b/drivers/gpu/drm/i915/gt/intel_engine_pm.c index 8ec3eecf3e39..f7b2e07e2229 100644 --- a/drivers/gpu/drm/i915/gt/intel_engine_pm.c +++ b/drivers/gpu/drm/i915/gt/intel_engine_pm.c @@ -6,6 +6,7 @@ #include "i915_drv.h" +#include "intel_breadcrumbs.h" #include "intel_context.h" #include "intel_engine.h" #include "intel_engine_heartbeat.h" @@ -247,7 +248,7 @@ static int __engine_park(struct intel_wakeref *wf) call_idle_barriers(engine); /* cleanup after wedging */ intel_engine_park_heartbeat(engine); - intel_engine_disarm_breadcrumbs(engine); + intel_breadcrumbs_park(engine->breadcrumbs); /* Must be reset upon idling, or we may miss the busy wakeup. */ GEM_BUG_ON(engine->execlists.queue_priority_hint != INT_MIN); diff --git a/drivers/gpu/drm/i915/gt/intel_engine_types.h b/drivers/gpu/drm/i915/gt/intel_engine_types.h index 8de92fd7d392..c400aaa2287b 100644 --- a/drivers/gpu/drm/i915/gt/intel_engine_types.h +++ b/drivers/gpu/drm/i915/gt/intel_engine_types.h @@ -22,6 +22,7 @@ #include "i915_pmu.h" #include "i915_priolist_types.h" #include "i915_selftest.h" +#include "intel_breadcrumbs_types.h" #include "intel_sseu.h" #include "intel_timeline_types.h" #include "intel_uncore.h" @@ -373,34 +374,8 @@ struct intel_engine_cs { */ struct ewma__engine_latency latency; - /* Rather than have every client wait upon all user interrupts, - * with the herd waking after every interrupt and each doing the - * heavyweight seqno dance, we delegate the task (of being the - * bottom-half of the user interrupt) to the first client. After - * every interrupt, we wake up one client, who does the heavyweight - * coherent seqno read and either goes back to sleep (if incomplete), - * or wakes up all the completed clients in parallel, before then - * transferring the bottom-half status to the next client in the queue. - * - * Compared to walking the entire list of waiters in a single dedicated - * bottom-half, we reduce the latency of the first waiter by avoiding - * a context switch, but incur additional coherent seqno reads when - * following the chain of request breadcrumbs. Since it is most likely - * that we have a single client waiting on each seqno, then reducing - * the overhead of waking that client is much preferred. - */ - struct intel_breadcrumbs { - spinlock_t irq_lock; - struct list_head signalers; - - struct list_head signaled_requests; - - struct irq_work irq_work; /* for use from inside irq_lock */ - - unsigned int irq_enabled; - - bool irq_armed; - } breadcrumbs; + /* Keep track of all the seqno used, a trail of breadcrumbs */ + struct intel_breadcrumbs *breadcrumbs; struct intel_engine_pmu { /** diff --git a/drivers/gpu/drm/i915/gt/intel_gt_irq.c b/drivers/gpu/drm/i915/gt/intel_gt_irq.c index b05da68e52f4..257063a57101 100644 --- a/drivers/gpu/drm/i915/gt/intel_gt_irq.c +++ b/drivers/gpu/drm/i915/gt/intel_gt_irq.c @@ -8,6 +8,7 @@ #include "i915_drv.h" #include "i915_irq.h" +#include "intel_breadcrumbs.h" #include "intel_gt.h" #include "intel_gt_irq.h" #include "intel_uncore.h" diff --git a/drivers/gpu/drm/i915/gt/intel_lrc.c b/drivers/gpu/drm/i915/gt/intel_lrc.c index 5e8278e8ac79..9112bb07a068 100644 --- a/drivers/gpu/drm/i915/gt/intel_lrc.c +++ b/drivers/gpu/drm/i915/gt/intel_lrc.c @@ -137,6 +137,7 @@ #include "i915_perf.h" #include "i915_trace.h" #include "i915_vgpu.h" +#include "intel_breadcrumbs.h" #include "intel_context.h" #include "intel_engine_pm.h" #include "intel_gt.h" @@ -4119,7 +4120,7 @@ static int execlists_resume(struct intel_engine_cs *engine) { intel_mocs_init_engine(engine); - intel_engine_reset_breadcrumbs(engine); + intel_breadcrumbs_reset(engine->breadcrumbs); if (GEM_SHOW_DEBUG() && unexpected_starting_state(engine)) { struct drm_printer p = drm_debug_printer(__func__); @@ -5704,9 +5705,7 @@ intel_execlists_create_virtual(struct intel_engine_cs **siblings, snprintf(ve->base.name, sizeof(ve->base.name), "virtual"); intel_engine_init_active(&ve->base, ENGINE_VIRTUAL); - intel_engine_init_breadcrumbs(&ve->base); intel_engine_init_execlists(&ve->base); - ve->base.breadcrumbs.irq_armed = true; /* fake HW, used for irq_work */ ve->base.cops = &virtual_context_ops; ve->base.request_alloc = execlists_request_alloc; @@ -5723,6 +5722,12 @@ intel_execlists_create_virtual(struct intel_engine_cs **siblings, intel_context_init(&ve->context, &ve->base); + ve->base.breadcrumbs = intel_breadcrumbs_create(NULL); + if (!ve->base.breadcrumbs) { + err = -ENOMEM; + goto err_put; + } + for (n = 0; n < count; n++) { struct intel_engine_cs *sibling = siblings[n]; diff --git a/drivers/gpu/drm/i915/gt/intel_reset.c b/drivers/gpu/drm/i915/gt/intel_reset.c index 46a5ceffc22f..ac36b67fb46b 100644 --- a/drivers/gpu/drm/i915/gt/intel_reset.c +++ b/drivers/gpu/drm/i915/gt/intel_reset.c @@ -15,6 +15,7 @@ #include "i915_drv.h" #include "i915_gpu_error.h" #include "i915_irq.h" +#include "intel_breadcrumbs.h" #include "intel_engine_pm.h" #include "intel_gt.h" #include "intel_gt_pm.h" diff --git a/drivers/gpu/drm/i915/gt/intel_ring_submission.c b/drivers/gpu/drm/i915/gt/intel_ring_submission.c index 94915f668715..186aa2d3a83e 100644 --- a/drivers/gpu/drm/i915/gt/intel_ring_submission.c +++ b/drivers/gpu/drm/i915/gt/intel_ring_submission.c @@ -32,6 +32,7 @@ #include "gen6_ppgtt.h" #include "gen7_renderclear.h" #include "i915_drv.h" +#include "intel_breadcrumbs.h" #include "intel_context.h" #include "intel_gt.h" #include "intel_reset.h" @@ -255,7 +256,7 @@ static int xcs_resume(struct intel_engine_cs *engine) else ring_setup_status_page(engine); - intel_engine_reset_breadcrumbs(engine); + intel_breadcrumbs_reset(engine->breadcrumbs); /* Enforce ordering by reading HEAD register back */ ENGINE_POSTING_READ(engine, RING_HEAD); diff --git a/drivers/gpu/drm/i915/gt/intel_rps.c b/drivers/gpu/drm/i915/gt/intel_rps.c index 97ba14ad52e4..e6a00eea0631 100644 --- a/drivers/gpu/drm/i915/gt/intel_rps.c +++ b/drivers/gpu/drm/i915/gt/intel_rps.c @@ -7,6 +7,7 @@ #include <drm/i915_drm.h> #include "i915_drv.h" +#include "intel_breadcrumbs.h" #include "intel_gt.h" #include "intel_gt_clock_utils.h" #include "intel_gt_irq.h" diff --git a/drivers/gpu/drm/i915/gt/mock_engine.c b/drivers/gpu/drm/i915/gt/mock_engine.c index 06303ba98c19..d1971ffdca42 100644 --- a/drivers/gpu/drm/i915/gt/mock_engine.c +++ b/drivers/gpu/drm/i915/gt/mock_engine.c @@ -261,11 +261,12 @@ static void mock_engine_release(struct intel_engine_cs *engine) GEM_BUG_ON(timer_pending(&mock->hw_delay)); + intel_breadcrumbs_free(engine->breadcrumbs); + intel_context_unpin(engine->kernel_context); intel_context_put(engine->kernel_context); intel_engine_fini_retire(engine); - intel_engine_fini_breadcrumbs(engine); } struct intel_engine_cs *mock_engine(struct drm_i915_private *i915, @@ -323,11 +324,14 @@ int mock_engine_init(struct intel_engine_cs *engine) struct intel_context *ce; intel_engine_init_active(engine, ENGINE_MOCK); - intel_engine_init_breadcrumbs(engine); intel_engine_init_execlists(engine); intel_engine_init__pm(engine); intel_engine_init_retire(engine); + engine->breadcrumbs = intel_breadcrumbs_create(NULL); + if (!engine->breadcrumbs) + return -ENOMEM; + ce = create_kernel_context(engine); if (IS_ERR(ce)) goto err_breadcrumbs; @@ -339,7 +343,7 @@ int mock_engine_init(struct intel_engine_cs *engine) return 0; err_breadcrumbs: - intel_engine_fini_breadcrumbs(engine); + intel_breadcrumbs_free(engine->breadcrumbs); return -ENOMEM; } diff --git a/drivers/gpu/drm/i915/i915_irq.c b/drivers/gpu/drm/i915/i915_irq.c index 1fa67700d8f4..f113fe44572b 100644 --- a/drivers/gpu/drm/i915/i915_irq.c +++ b/drivers/gpu/drm/i915/i915_irq.c @@ -41,6 +41,7 @@ #include "display/intel_lpe_audio.h" #include "display/intel_psr.h" +#include "gt/intel_breadcrumbs.h" #include "gt/intel_gt.h" #include "gt/intel_gt_irq.h" #include "gt/intel_gt_pm_irq.h" diff --git a/drivers/gpu/drm/i915/i915_request.c b/drivers/gpu/drm/i915/i915_request.c index ada630677cf3..394587e70a2d 100644 --- a/drivers/gpu/drm/i915/i915_request.c +++ b/drivers/gpu/drm/i915/i915_request.c @@ -31,6 +31,7 @@ #include <linux/sched/signal.h> #include "gem/i915_gem_context.h" +#include "gt/intel_breadcrumbs.h" #include "gt/intel_context.h" #include "gt/intel_ring.h" #include "gt/intel_rps.h" diff --git a/drivers/gpu/drm/i915/i915_request.h b/drivers/gpu/drm/i915/i915_request.h index fc18378c685d..16b721080195 100644 --- a/drivers/gpu/drm/i915/i915_request.h +++ b/drivers/gpu/drm/i915/i915_request.h @@ -361,10 +361,6 @@ void i915_request_submit(struct i915_request *request); void __i915_request_unsubmit(struct i915_request *request); void i915_request_unsubmit(struct i915_request *request); -/* Note: part of the intel_breadcrumbs family */ -bool i915_request_enable_breadcrumb(struct i915_request *request); -void i915_request_cancel_breadcrumb(struct i915_request *request); - long i915_request_wait(struct i915_request *rq, unsigned int flags, long timeout)

[05/10] drm/i915/gt: Distinguish the virtual breadcrumbs from the irq breadcrumbs

Commit Message

Comments

Patch