Support for more than two execlist ports (v2)
Subsystems (2)
cover Support for more than two execlist ports (v2)
Hi,
HWSP context status buffer handling and guc cleanup and request coalescing series were merged and those triggered non trivial rebase. So I had to drop reviewed-by's from the patches :(
First 4 should be tasting more or less the same though.
Thankyou for review and comments!
-Mika
Mika Kuoppala (8):
drm/i915: Make own struct for execlist items drm/i915: Move execlist initialization into intel_engine_cs.c drm/i915: Wrap port cancellation into a function drm/i915: Add execlist_port_complete
drm/i915: Make execlist port count variable drm/i915: Introduce execlist_port_* accessors drm/i915: Keep track of reserved execlist ports drm/i915: Improve GuC request coalescing
drivers/gpu/drm/i915/i915_debugfs.c | 24 ++-- drivers/gpu/drm/i915/i915_drv.h | 3 +- drivers/gpu/drm/i915/i915_gem.c | 6 +- drivers/gpu/drm/i915/i915_gpu_error.c | 17 ++- drivers/gpu/drm/i915/i915_guc_submission.c | 102 ++++++++------ drivers/gpu/drm/i915/i915_irq.c | 5 +- drivers/gpu/drm/i915/intel_engine_cs.c | 48 +++++-- drivers/gpu/drm/i915/intel_lrc.c | 214 ++++++++++++++++------------- drivers/gpu/drm/i915/intel_ringbuffer.h | 197 +++++++++++++++++++++++--- 9 files changed, 424 insertions(+), 192 deletions(-)
Signature · 6 lines
2.11.0 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
PATCH 1/8 drm/i915: Make own struct for execlist items
Engine's execlist related items have been increasing to a point where a separate struct is warranted. Carve execlist specific items to a dedicated struct to add clarity.
v2: add kerneldoc and fix whitespace (Joonas, Chris)
v3: csb_mmio changes, rebase
--- drivers/gpu/drm/i915/i915_debugfs.c | 8 +-- drivers/gpu/drm/i915/i915_gem.c | 6 +- drivers/gpu/drm/i915/i915_gpu_error.c | 4 +- drivers/gpu/drm/i915/i915_guc_submission.c | 31 +++++---- drivers/gpu/drm/i915/i915_irq.c | 5 +- drivers/gpu/drm/i915/intel_engine_cs.c | 12 ++-- drivers/gpu/drm/i915/intel_lrc.c | 100 +++++++++++++++-------------- drivers/gpu/drm/i915/intel_ringbuffer.h | 100 +++++++++++++++++++++++------ 8 files changed, 167 insertions(+), 99 deletions(-)
drivers/gpu/drm/i915/i915_debugfs.c +4 -4
@@ -3324,7 +3324,7 @@ static int i915_engine_info(struct seq_file *m, void *unused) read =GEN8_CSB_READ_PTR (ptr); write =GEN8_CSB_WRITE_PTR (ptr); seq_printf(m, "\tExeclist CSB read %d [%d cached], write %d [%d from hws], interrupt posted? %s\n", - read, engine->csb_head, + read, engine->execlist.csb_head, write, intel_read_status_page(engine, intel_hws_csb_write_index(engine->i915)), yesno(test_bit(ENGINE_IRQ_EXECLIST,
@@ -3346,10 +3346,10 @@ static int i915_engine_info(struct seq_file *m, void *unused) }rcu_read_lock (); -for (idx =0 ; idx <ARRAY_SIZE (engine->execlist_port); idx++) { +for (idx =0 ; idx <ARRAY_SIZE (engine->execlist.port); idx++) {unsigned int count; - rq =port_unpack (&engine->execlist_port[idx], + rq =port_unpack (&engine->execlist.port[idx], &count);if (rq) { seq_printf(m, "\t\tELSP[%d] count=%d, ",
@@ -3363,7 +3363,7 @@ static int i915_engine_info(struct seq_file *m, void *unused)rcu_read_unlock ();spin_lock_irq (&engine->timeline->lock); -for (rb = engine->execlist_first; rb; rb =rb_next (rb)){ +for (rb = engine->execlist.first; rb; rb =rb_next (rb)) {struct i915_priolist *p =rb_entry (rb,typeof (*p), node);
drivers/gpu/drm/i915/i915_gem.c +3 -3
@@ -2815,8 +2815,8 @@ i915_gem_reset_prepare_engine(struct intel_engine_cs *engine)* Turning off the engine->irq_tasklet until the reset is over * prevents the race. */ -tasklet_kill (&engine->irq_tasklet); -tasklet_disable (&engine->irq_tasklet); +tasklet_kill (&engine->execlist.irq_tasklet); +tasklet_disable (&engine->execlist.irq_tasklet);if (engine->irq_seqno_barrier) engine->irq_seqno_barrier (engine);
@@ -2995,7 +2995,7 @@ void i915_gem_reset(struct drm_i915_private *dev_priv)void i915_gem_reset_finish_engine (struct intel_engine_cs *engine) { -tasklet_enable (&engine->irq_tasklet); +tasklet_enable (&engine->execlist.irq_tasklet);kthread_unpark (engine->breadcrumbs.signaler); }
drivers/gpu/drm/i915/i915_gpu_error.c +2 -2
@@ -1327,10 +1327,10 @@ static void engine_record_requests(struct intel_engine_cs *engine,static void error_record_engine_execlists (struct intel_engine_cs *engine,struct drm_i915_error_engine *ee) { -const struct execlist_port *port = engine->execlist_port; +const struct execlist_port *port = engine->execlist.port;unsigned int n; -for (n =0 ; n <ARRAY_SIZE (engine->execlist_port); n++) { +for (n =0 ; n <ARRAY_SIZE (engine->execlist.port); n++) {struct drm_i915_gem_request *rq =port_request (&port[n]);if (!rq)
drivers/gpu/drm/i915/i915_guc_submission.c +17 -14
@@ -494,11 +494,12 @@ static void i915_guc_submit(struct intel_engine_cs *engine)struct drm_i915_private *dev_priv = engine->i915;struct intel_guc *guc = &dev_priv->guc;struct i915_guc_client *client = guc->execbuf_client; -struct execlist_port *port = engine->execlist_port; -unsigned int engine_id = engine->id; +struct intel_engine_execlist *const el = &engine->execlist; +struct execlist_port *port = el->port; +const unsigned int engine_id = engine->id;unsigned int n; -for (n =0 ; n <ARRAY_SIZE (engine->execlist_port); n++) { +for (n =0 ; n <ARRAY_SIZE (el->port); n++) {struct drm_i915_gem_request *rq;unsigned int count;
@@ -558,7 +559,8 @@ static void port_assign(struct execlist_port *port,static void i915_guc_dequeue (struct intel_engine_cs *engine) { -struct execlist_port *port = engine->execlist_port; +struct intel_engine_execlist *const el = &engine->execlist; +struct execlist_port *port = el->port;struct drm_i915_gem_request *last =NULL ;bool submit = false;struct rb_node *rb;
@@ -567,15 +569,15 @@ static void i915_guc_dequeue(struct intel_engine_cs *engine) port++;spin_lock_irq (&engine->timeline->lock); - rb = engine->execlist_first; -GEM_BUG_ON (rb_first (&engine->execlist_queue) != rb); + rb = el->first; +GEM_BUG_ON (rb_first (&el->queue) != rb);while (rb) {struct i915_priolist *p =rb_entry (rb,typeof (*p), node);struct drm_i915_gem_request *rq, *rn;list_for_each_entry_safe (rq, rn, &p->requests, priotree.link) {if (last && rq->ctx != last->ctx) { -if (port != engine->execlist_port) { +if (port != el->port) {__list_del_many (&p->requests, &rq->priotree.link); goto done;
@@ -596,13 +598,13 @@ static void i915_guc_dequeue(struct intel_engine_cs *engine) } rb =rb_next (rb); -rb_erase (&p->node, &engine->execlist_queue); +rb_erase (&p->node, &el->queue);INIT_LIST_HEAD (&p->requests);if (p->priority !=I915_PRIORITY_NORMAL )kmem_cache_free (engine->i915->priorities, p); } done: - engine->execlist_first = rb; + el->first = rb;if (submit) {port_assign (port, last);i915_guc_submit (engine);
@@ -612,8 +614,8 @@ static void i915_guc_dequeue(struct intel_engine_cs *engine)static void i915_guc_irq_handler (unsigned long data) { -struct intel_engine_cs *engine = (struct intel_engine_cs *)data; -struct execlist_port *port = engine->execlist_port; +struct intel_engine_cs *const engine = (struct intel_engine_cs *)data; +struct execlist_port *port = engine->execlist.port;struct drm_i915_gem_request *rq; rq =port_request (&port[0 ]);
@@ -1144,7 +1146,7 @@ int i915_guc_submission_enable(struct drm_i915_private *dev_priv)* and it is guaranteed that it will remove the work item from the * queue before our request is completed. */ -BUILD_BUG_ON (ARRAY_SIZE (engine->execlist_port) * +BUILD_BUG_ON (ARRAY_SIZE (engine->execlist.port) *sizeof (struct guc_wq_item ) *I915_NUM_ENGINES >GUC_WQ_SIZE );
@@ -1175,14 +1177,15 @@ int i915_guc_submission_enable(struct drm_i915_private *dev_priv)guc_interrupts_capture (dev_priv);for_each_engine (engine, dev_priv, id) { +struct intel_engine_execlist *const el = &engine->execlist;/* The tasklet was initialised by execlists, and may be in * a state of flux (across a reset) and so we just want to * take over the callback without changing any other state * in the tasklet. */ - engine->irq_tasklet.func = i915_guc_irq_handler; + el->irq_tasklet.func = i915_guc_irq_handler;clear_bit (ENGINE_IRQ_EXECLIST , &engine->irq_posted); -tasklet_schedule (&engine->irq_tasklet); +tasklet_schedule (&el->irq_tasklet); }return 0 ;
drivers/gpu/drm/i915/i915_irq.c +3 -2
@@ -1338,10 +1338,11 @@ static void snb_gt_irq_handler(struct drm_i915_private *dev_priv,static void gen8_cs_irq_handler (struct intel_engine_cs *engine,u32 iir,int test_shift) { +struct intel_engine_execlist *const el = &engine->execlist;bool tasklet = false;if (iir & (GT_CONTEXT_SWITCH_INTERRUPT << test_shift)) { -if (port_count (&engine->execlist_port[0 ])) { +if (port_count (&el->port[0 ])) {__set_bit (ENGINE_IRQ_EXECLIST , &engine->irq_posted); tasklet = true; }
@@ -1353,7 +1354,7 @@ gen8_cs_irq_handler(struct intel_engine_cs *engine, u32 iir, int test_shift) }if (tasklet) -tasklet_hi_schedule (&engine->irq_tasklet); +tasklet_hi_schedule (&el->irq_tasklet); } static irqreturn_t gen8_gt_irq_ack(struct drm_i915_private *dev_priv,
drivers/gpu/drm/i915/intel_engine_cs.c +6 -6
@@ -391,8 +391,8 @@ static void intel_engine_init_timeline(struct intel_engine_cs *engine)*/ void intel_engine_setup_common (struct intel_engine_cs *engine) { - engine->execlist_queue =RB_ROOT ; - engine->execlist_first =NULL ; + engine->execlist.queue =RB_ROOT ; + engine->execlist.first =NULL ;intel_engine_init_timeline (engine);intel_engine_init_hangcheck (engine);
@@ -1473,11 +1473,11 @@ bool intel_engine_is_idle(struct intel_engine_cs *engine)return false;/* Both ports drained, no more ELSP submission? */ -if (port_request (&engine->execlist_port[0 ])) +if (port_request (&engine->execlist.port[0 ]))return false;/* ELSP is empty, but there are ready requests? */ -if (READ_ONCE (engine->execlist_first)) +if (READ_ONCE (engine->execlist.first))return false;/* Ring stopped? */
@@ -1526,8 +1526,8 @@ void intel_engines_mark_idle(struct drm_i915_private *i915)for_each_engine (engine, i915, id) {intel_engine_disarm_breadcrumbs (engine);i915_gem_batch_pool_fini (&engine->batch_pool); -tasklet_kill (&engine->irq_tasklet); - engine->no_priolist = false; +tasklet_kill (&engine->execlist.irq_tasklet); + engine->execlist.no_priolist = false; } }
drivers/gpu/drm/i915/intel_lrc.c +53 -47
323 lines not on this page · raw message
drivers/gpu/drm/i915/intel_ringbuffer.h +79 -21
112 lines not on this page · raw message
Signature · 6 lines
2.11.0 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Re: [PATCH 1/8] drm/i915: Make own struct for execlist items
Quoted 4 lines · Mika Kuoppala
Engine's execlist related items have been increasing to a point where a separate struct is warranted. Carve execlist specific items to a dedicated struct to add clarity.
Quoted 8 lines
v2: add kerneldoc and fix whitespace (Joonas, Chris)
v3:csb_mmiochanges, rebaseSuggested-by Chris Wilson <[email protected]>Cc Chris Wilson <[email protected]>Cc Joonas Lahtinen <[email protected]>Signed-off-by Mika Kuoppala <[email protected]>Acked-by Joonas Lahtinen <[email protected]>
-Michał
Quoted 10 lines
--- drivers/gpu/drm/i915/i915_debugfs.c | 8 +-- drivers/gpu/drm/i915/i915_gem.c | 6 +- drivers/gpu/drm/i915/i915_gpu_error.c | 4 +- drivers/gpu/drm/i915/i915_guc_submission.c | 31 +++++---- drivers/gpu/drm/i915/i915_irq.c | 5 +- drivers/gpu/drm/i915/intel_engine_cs.c | 12 ++-- drivers/gpu/drm/i915/intel_lrc.c | 100 +++++++++++++++-------------- drivers/gpu/drm/i915/intel_ringbuffer.h | 100 +++++++++++++++++++++++------ 8 files changed, 167 insertions(+), 99 deletions(-)
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Re: [PATCH 1/8] drm/i915: Make own struct for execlist items
In reply to Mika KuoppalaQuoting Mika Kuoppala (2017-09-20 15:36:58)
Quoted 4 lines
Engine's execlist related items have been increasing to a point where a separate struct is warranted. Carve execlist specific items to a dedicated struct to add clarity.
Quoted 8 lines
v2: add kerneldoc and fix whitespace (Joonas, Chris)
v3:csb_mmiochanges, rebaseSuggested-by Chris Wilson <[email protected]>Cc Chris Wilson <[email protected]>Cc Joonas Lahtinen <[email protected]>Signed-off-by Mika Kuoppala <[email protected]>Acked-by Joonas Lahtinen <[email protected]>
-Chris
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Re: [PATCH 1/8] drm/i915: Make own struct for execlist items
In reply to Mika KuoppalaQuoted 4 lines · Mika Kuoppala
Engine's execlist related items have been increasing to a point where a separate struct is warranted. Carve execlist specific items to a dedicated struct to add clarity.
Quoted 8 lines
v2: add kerneldoc and fix whitespace (Joonas, Chris)
v3:csb_mmiochanges, rebaseSuggested-by Chris Wilson <[email protected]>Cc Chris Wilson <[email protected]>Cc Joonas Lahtinen <[email protected]>Signed-off-by Mika Kuoppala <[email protected]>Acked-by Joonas Lahtinen <[email protected]>
With s/\b(el|execlist)\b/execlists/ this is;
Please rebase and merge, it's going to cause rebases anyway, so now is the best time after yesterday.
Regards, Joonas
Signature · 7 lines
Joonas Lahtinen Open Source Technology Center Intel Corporation _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
PATCH 2/8 drm/i915: Move execlist initialization into intel_engine_cs.c
In reply to Mika KuoppalaMove execlist init into a common engine setup. As it is common to both guc and hw execlists.
v2: rebase with csb changes
--- drivers/gpu/drm/i915/intel_engine_cs.c | 31 ++++++++++++++++++++++++++++--- drivers/gpu/drm/i915/intel_lrc.c | 19 ------------------- 2 files changed, 28 insertions(+), 22 deletions(-)
drivers/gpu/drm/i915/intel_engine_cs.c +28 -3
@@ -380,6 +380,33 @@ static void intel_engine_init_timeline(struct intel_engine_cs *engine) engine->timeline = &engine->i915->gt.global_timeline.engine[engine->id]; } +static bool csb_force_mmio (struct drm_i915_private *i915) +{ +/* GVT emulation depends upon intercepting CSB mmio */ +if (intel_vgpu_active (i915)) +return true; + +/* +* IOMMU adds unpredictable latency causing the CSB write (from the +* GPU into the HWSP) to only be visible some time after the interrupt +* (missed breadcrumb syndrome). +*/ +if (intel_vtd_active ()) +return true; + +return false; +} + +static void intel_engine_init_execlist (struct intel_engine_cs *engine) +{ +struct intel_engine_execlist *const el = &engine->execlist; + + el->csb_use_mmio =csb_force_mmio (engine->i915); + + el->queue =RB_ROOT ; + el->first =NULL ; +} +/** * intel_engines_setup_common - setup engine state not requiring hw access * @engine: Engine to setup.
@@ -391,9 +418,7 @@ static void intel_engine_init_timeline(struct intel_engine_cs *engine)*/ void intel_engine_setup_common (struct intel_engine_cs *engine) { - engine->execlist.queue =RB_ROOT ; - engine->execlist.first =NULL ; - +intel_engine_init_execlist (engine);intel_engine_init_timeline (engine);intel_engine_init_hangcheck (engine);i915_gem_batch_pool_init (engine, &engine->batch_pool);
drivers/gpu/drm/i915/intel_lrc.c +0 -19
@@ -1784,23 +1784,6 @@ logical_ring_default_irqs(struct intel_engine_cs *engine) engine->irq_keep_mask =GT_CONTEXT_SWITCH_INTERRUPT << shift; } -static bool irq_handler_force_mmio (struct drm_i915_private *i915) -{ -/* GVT emulation depends upon intercepting CSB mmio */ -if (intel_vgpu_active (i915)) -return true; - -/* -* IOMMU adds unpredictable latency causing the CSB write (from the -* GPU into the HWSP) to only be visible some time after the interrupt -* (missed breadcrumb syndrome). -*/ -if (intel_vtd_active ()) -return true; - -return false; -} -static void logical_ring_setup (struct intel_engine_cs *engine) {
@@ -1812,8 +1795,6 @@ logical_ring_setup(struct intel_engine_cs *engine)/* Intentionally left blank. */ engine->buffer =NULL ; - engine->execlist.csb_use_mmio =irq_handler_force_mmio (dev_priv); - fw_domains =intel_uncore_forcewake_for_reg (dev_priv,RING_ELSP (engine),FW_REG_WRITE );
Signature · 6 lines
2.11.0 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Re: [PATCH 2/8] drm/i915: Move execlist initialization into intel_engine_cs.c
Quoting Mika Kuoppala (2017-09-20 15:36:59)
Quoted 6 lines
Move execlist init into a common engine setup. As it is common to both guc and hw execlists.
v2: rebase with csb changes
Signed-off-by Mika Kuoppala <[email protected]>
-Chris
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
PATCH 3/8 drm/i915: Wrap port cancellation into a function
In reply to Mika KuoppalaOn reset and wedged path, we want to release the requests that are tied to ports and then mark the ports to be unset. Introduce a function for this.
v2: rebase
--- drivers/gpu/drm/i915/intel_lrc.c | 21 ++++++++++++--------- 1 file changed, 12 insertions(+), 9 deletions(-)
drivers/gpu/drm/i915/intel_lrc.c +12 -9
@@ -568,6 +568,16 @@ static void execlists_dequeue(struct intel_engine_cs *engine)execlists_submit_ports (engine); } +static void execlist_cancel_port_requests (struct intel_engine_execlist *el) +{ +unsigned int i; + +for (i =0 ; i <ARRAY_SIZE (el->port); i++) +i915_gem_request_put (port_request (&el->port[i])); + +memset (el->port,0 ,sizeof (el->port)); +} +static void execlists_cancel_requests (struct intel_engine_cs *engine) {struct intel_engine_execlist *const el = &engine->execlist;
@@ -575,14 +585,11 @@ static void execlists_cancel_requests(struct intel_engine_cs *engine)struct drm_i915_gem_request *rq, *rn;struct rb_node *rb;unsigned long flags; -unsigned long n;spin_lock_irqsave (&engine->timeline->lock, flags);/* Cancel the requests on the HW and clear the ELSP tracker. */ -for (n =0 ; n <ARRAY_SIZE (el->port); n++) -i915_gem_request_put (port_request (&port[n])); -memset (el->port,0 ,sizeof (el->port)); +execlist_cancel_port_requests (el);/* Mark all executing requests as skipped. */ list_for_each_entry (rq, &engine->timeline->requests, link) {
@@ -1372,11 +1379,9 @@ static void reset_common_ring(struct intel_engine_cs *engine, struct drm_i915_gem_request *request) {struct intel_engine_execlist *const el = &engine->execlist; -struct execlist_port *port = el->port;struct drm_i915_gem_request *rq, *rn;struct intel_context *ce;unsigned long flags; -unsigned int n;spin_lock_irqsave (&engine->timeline->lock, flags);
@@ -1389,9 +1394,7 @@ static void reset_common_ring(struct intel_engine_cs *engine,* guessing the missed context-switch events by looking at what * requests were completed. */ -for (n =0 ; n <ARRAY_SIZE (el->port); n++) -i915_gem_request_put (port_request (&port[n])); -memset (el->port,0 ,sizeof (el->port)); +execlist_cancel_port_requests (el);/* Push back any incomplete requests for replay after the reset. */ list_for_each_entry_safe_reverse(rq, rn,
Signature · 6 lines
2.11.0 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Re: [PATCH 3/8] drm/i915: Wrap port cancellation into a function
Quoted 34 lines · Mika Kuoppala
On reset and wedged path, we want to release the requests that are tied to ports and then mark the ports to be unset. Introduce a function for this.
v2: rebase
Cc Chris Wilson <[email protected]>Signed-off-by Mika Kuoppala <[email protected]>--- drivers/gpu/drm/i915/intel_lrc.c | 21 ++++++++++++--------- 1 file changed, 12 insertions(+), 9 deletions(-)drivers/gpu/drm/i915/intel_lrc.c +10
-0@@ -568,6 +568,16 @@ static void execlists_dequeue(struct intel_engine_cs *engine)execlists_submit_ports (engine); } +static void execlist_cancel_port_requests (struct intel_engine_execlist *el) +{ +unsigned int i; + +for (i =0 ; i <ARRAY_SIZE (el->port); i++) +i915_gem_request_put (port_request (&el->port[i])); + +memset (el->port,0 ,sizeof (el->port)); +} +static void execlists_cancel_requests (struct intel_engine_cs *engine) {struct intel_engine_execlist *const el = &engine->execlist;
drivers/gpu/drm/i915/intel_lrc.c static void execlists_cancel_requests(struct intel_engine_cs *engine) · line 584
Quoted 10 lines
drivers/gpu/drm/i915/intel_lrc.c +0
-3@@ -575,14 +585,11 @@ static void execlists_cancel_requests(struct intel_engine_cs *engine)struct drm_i915_gem_request *rq, *rn;struct rb_node *rb;unsigned long flags; -unsigned long n;spin_lock_irqsave (&engine->timeline->lock, flags);/* Cancel the requests on the HW and clear the ELSP tracker. */ -for (n =0 ; n <ARRAY_SIZE (el->port); n++) -i915_gem_request_put (port_request (&port[n]));
We could also drop the local variable for port.
It's only used in GEM_BUG_ON(port_isset(&port[0])).
Do we even need this assert when we're starting to treat ports in a more ring-like fashion?
-Michał
Quoted 35 lines
drivers/gpu/drm/i915/intel_lrc.c +2
-6-memset (el->port,0 ,sizeof (el->port)); +execlist_cancel_port_requests (el);/* Mark all executing requests as skipped. */ list_for_each_entry (rq, &engine->timeline->requests, link) {@@ -1372,11 +1379,9 @@ static void reset_common_ring(struct intel_engine_cs *engine, struct drm_i915_gem_request *request) {struct intel_engine_execlist *const el = &engine->execlist; -struct execlist_port *port = el->port;struct drm_i915_gem_request *rq, *rn;struct intel_context *ce;unsigned long flags; -unsigned int n;spin_lock_irqsave (&engine->timeline->lock, flags);@@ -1389,9 +1394,7 @@ static void reset_common_ring(struct intel_engine_cs *engine,* guessing the missed context-switch events by looking at what * requests were completed. */ -for (n =0 ; n <ARRAY_SIZE (el->port); n++) -i915_gem_request_put (port_request (&port[n])); -memset (el->port,0 ,sizeof (el->port)); +execlist_cancel_port_requests (el);/* Push back any incomplete requests for replay after the reset. */ list_for_each_entry_safe_reverse(rq, rn,Signature · 6 lines
2.11.0 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Re: [PATCH 3/8] drm/i915: Wrap port cancellation into a function
Quoted 40 lines · Michał Winiarski
Quoted 39 lines · Mika Kuoppala
On reset and wedged path, we want to release the requests that are tied to ports and then mark the ports to be unset. Introduce a function for this.
v2: rebase
Cc Chris Wilson <[email protected]>Signed-off-by Mika Kuoppala <[email protected]>--- drivers/gpu/drm/i915/intel_lrc.c | 21 ++++++++++++--------- 1 file changed, 12 insertions(+), 9 deletions(-)drivers/gpu/drm/i915/intel_lrc.c +10
-1@@ -568,6 +568,16 @@ static void execlists_dequeue(struct intel_engine_cs *engine)execlists_submit_ports (engine); } +static void execlist_cancel_port_requests (struct intel_engine_execlist *el) +{ +unsigned int i; + +for (i =0 ; i <ARRAY_SIZE (el->port); i++) +i915_gem_request_put (port_request (&el->port[i])); + +memset (el->port,0 ,sizeof (el->port)); +} +static void execlists_cancel_requests (struct intel_engine_cs *engine) {struct intel_engine_execlist *const el = &engine->execlist;@@ -575,14 +585,11 @@ static void execlists_cancel_requests(struct intel_engine_cs *engine)struct drm_i915_gem_request *rq, *rn;struct rb_node *rb;unsigned long flags; -unsigned long n;
Quoted 7 lines
drivers/gpu/drm/i915/intel_lrc.c static void execlists_cancel_requests(struct intel_engine_cs *engine) · line 584
Quoted 5 lines
drivers/gpu/drm/i915/intel_lrc.c +0
-2spin_lock_irqsave (&engine->timeline->lock, flags);/* Cancel the requests on the HW and clear the ELSP tracker. */ -for (n =0 ; n <ARRAY_SIZE (el->port); n++) -i915_gem_request_put (port_request (&port[n]));We could also drop the local variable for port.
Dropped.
Quoted 4 lines
It's only used in GEM_BUG_ON(port_isset(&port[0])).
Do we even need this assert when we're starting to treat ports in a more ring-like fashion?
The memset is, still, so close there in this version that it indeed begs the question.
But it is there to ensure that we really did the port parts properly.
-Mika
Quoted 35 lines
Reviewed-by Michał Winiarski <[email protected]>-Michał
Quoted 31 lines
drivers/gpu/drm/i915/intel_lrc.c +2
-6-memset (el->port,0 ,sizeof (el->port)); +execlist_cancel_port_requests (el);/* Mark all executing requests as skipped. */ list_for_each_entry (rq, &engine->timeline->requests, link) {@@ -1372,11 +1379,9 @@ static void reset_common_ring(struct intel_engine_cs *engine, struct drm_i915_gem_request *request) {struct intel_engine_execlist *const el = &engine->execlist; -struct execlist_port *port = el->port;struct drm_i915_gem_request *rq, *rn;struct intel_context *ce;unsigned long flags; -unsigned int n;spin_lock_irqsave (&engine->timeline->lock, flags);@@ -1389,9 +1394,7 @@ static void reset_common_ring(struct intel_engine_cs *engine,* guessing the missed context-switch events by looking at what * requests were completed. */ -for (n =0 ; n <ARRAY_SIZE (el->port); n++) -i915_gem_request_put (port_request (&port[n])); -memset (el->port,0 ,sizeof (el->port)); +execlist_cancel_port_requests (el);/* Push back any incomplete requests for replay after the reset. */ list_for_each_entry_safe_reverse(rq, rn,Signature · 1 line
2.11.0
Quoted 4 lines
Quoted 4 lines
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Re: [PATCH 3/8] drm/i915: Wrap port cancellation into a function
In reply to Mika KuoppalaQuoting Mika Kuoppala (2017-09-20 15:37:00)
Quoted 8 lines
On reset and wedged path, we want to release the requests that are tied to ports and then mark the ports to be unset. Introduce a function for this.
v2: rebase
Cc Chris Wilson <[email protected]>Signed-off-by Mika Kuoppala <[email protected]>
-Chris
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
PATCH 4/8 drm/i915: Add execlist_port_complete
In reply to Mika KuoppalaWhen first execlist entry is processed, we move the port (contents). Introduce function for this as execlist and guc use this common operation.
v2: rebase. s/GEM_DEBUG_BUG/GEM_BUG (Chris)
--- drivers/gpu/drm/i915/i915_guc_submission.c | 8 ++++---- drivers/gpu/drm/i915/intel_lrc.c | 22 +++++++++++----------- drivers/gpu/drm/i915/intel_ringbuffer.h | 14 +++++++++++++- 3 files changed, 28 insertions(+), 16 deletions(-)
drivers/gpu/drm/i915/i915_guc_submission.c +4 -4
@@ -592,7 +592,7 @@ static void i915_guc_dequeue(struct intel_engine_cs *engine) rq->priotree.priority =INT_MAX ;__i915_gem_request_submit (rq); -trace_i915_gem_request_in (rq,port_index (port, engine)); +trace_i915_gem_request_in (rq,port_index (port, el)); last = rq; submit = true; }
@@ -615,7 +615,8 @@ static void i915_guc_dequeue(struct intel_engine_cs *engine)static void i915_guc_irq_handler (unsigned long data) {struct intel_engine_cs *const engine = (struct intel_engine_cs *)data; -struct execlist_port *port = engine->execlist.port; +struct intel_engine_execlist *const el = &engine->execlist; +struct execlist_port *port = el->port;struct drm_i915_gem_request *rq; rq =port_request (&port[0 ]);
@@ -623,8 +624,7 @@ static void i915_guc_irq_handler(unsigned long data)trace_i915_gem_request_out (rq);i915_gem_request_put (rq); - port[0 ] = port[1 ]; -memset (&port[1 ],0 ,sizeof (port[1 ])); +execlist_port_complete (el, port); rq =port_request (&port[0 ]); }
drivers/gpu/drm/i915/intel_lrc.c +11 -11
@@ -454,7 +454,8 @@ static void port_assign(struct execlist_port *port,static void execlists_dequeue (struct intel_engine_cs *engine) {struct drm_i915_gem_request *last; -struct execlist_port *port = engine->execlist.port; +struct intel_engine_execlist *const el = &engine->execlist; +struct execlist_port *port = el->port;struct rb_node *rb;bool submit = false;
@@ -468,8 +469,6 @@ static void execlists_dequeue(struct intel_engine_cs *engine)*/ last->tail = last->wa_tail; -GEM_BUG_ON (port_isset (&port[1 ])); -/* Hardware submission is through 2 ports. Conceptually each port * has a (RING_START, RING_HEAD, RING_TAIL) tuple. RING_START is * static for a context, and unique to each, so we only execute
@@ -492,8 +491,8 @@ static void execlists_dequeue(struct intel_engine_cs *engine)*/ spin_lock_irq (&engine->timeline->lock); - rb = engine->execlist.first; -GEM_BUG_ON (rb_first (&engine->execlist.queue) != rb); + rb = el->first; +GEM_BUG_ON (rb_first (&el->queue) != rb);while (rb) {struct i915_priolist *p =rb_entry (rb,typeof (*p), node);struct drm_i915_gem_request *rq, *rn;
@@ -516,7 +515,7 @@ static void execlists_dequeue(struct intel_engine_cs *engine)* combine this request with the last, then we * are done. */ -if (port != engine->execlist.port) { +if (port != el->port) {__list_del_many (&p->requests, &rq->priotree.link); goto done;
@@ -541,25 +540,27 @@ static void execlists_dequeue(struct intel_engine_cs *engine)if (submit)port_assign (port, last); port++; + +GEM_BUG_ON (port_isset (port)); }INIT_LIST_HEAD (&rq->priotree.link); rq->priotree.priority =INT_MAX ;__i915_gem_request_submit (rq); -trace_i915_gem_request_in (rq,port_index (port, engine)); +trace_i915_gem_request_in (rq,port_index (port, el)); last = rq; submit = true; } rb =rb_next (rb); -rb_erase (&p->node, &engine->execlist.queue); +rb_erase (&p->node, &el->queue);INIT_LIST_HEAD (&p->requests);if (p->priority !=I915_PRIORITY_NORMAL )kmem_cache_free (engine->i915->priorities, p); } done: - engine->execlist.first = rb; + el->first = rb;if (submit)port_assign (port, last);spin_unlock_irq (&engine->timeline->lock);
@@ -748,8 +749,7 @@ static void intel_lrc_irq_handler(unsigned long data)trace_i915_gem_request_out (rq);i915_gem_request_put (rq); - port[0 ] = port[1 ]; -memset (&port[1 ],0 ,sizeof (port[1 ])); +execlist_port_complete (el, port); }else {port_set (port,port_pack (rq, count)); }
drivers/gpu/drm/i915/intel_ringbuffer.h +13 -1
@@ -228,7 +228,7 @@ struct intel_engine_execlist {#define port_unpack (p, count) ptr_unpack_bits((p)->request_count, count, EXECLIST_COUNT_BITS)#define port_set (p, packed) ((p)->request_count = (packed))#define port_isset (p) ((p)->request_count) -#define port_index (p, e) ((p) - (e)->execlist.port) +#define port_index (p, el) ((p) - (el)->port)/** * @context_id: context ID for port
@@ -511,6 +511,18 @@ struct intel_engine_cs {u32 (*get_cmd_length_mask)(u32 cmd_header); }; +static inline void +execlist_port_complete (struct intel_engine_execlist *const el, +struct execlist_port *const port) +{ +struct execlist_port *const port1 = &el->port[1 ]; + +GEM_BUG_ON (port_index (port, el) !=0 ); + + *port = *port1; +memset (port1,0 ,sizeof (struct execlist_port )); +} +static inline unsigned int intel_engine_flag (const struct intel_engine_cs *engine) {
Signature · 6 lines
2.11.0 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Re: [PATCH 4/8] drm/i915: Add execlist_port_complete
Quoting Mika Kuoppala (2017-09-20 15:37:01)
Quoted 7 lines
When first execlist entry is processed, we move the port (contents). Introduce function for this as execlist and guc use this common operation.
v2: rebase. s/GEM_DEBUG_BUG/GEM_BUG (Chris)
Signed-off-by Mika Kuoppala <[email protected]>
-Chris
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
PATCH 5/8 drm/i915: Make execlist port count variable
In reply to Mika KuoppalaAs we emulate execlists on top of the GuC workqueue, it is not restricted to just 2 ports and we can increase that number arbitrarily to trade-off queue depth (i.e. scheduling latency) against pipeline bubbles.
v2: rebase. better commit msg (Chris)
--- drivers/gpu/drm/i915/i915_debugfs.c | 8 ++++---- drivers/gpu/drm/i915/i915_drv.h | 3 ++- drivers/gpu/drm/i915/i915_gpu_error.c | 17 ++++++++++++----- drivers/gpu/drm/i915/i915_guc_submission.c | 8 ++++++-- drivers/gpu/drm/i915/intel_engine_cs.c | 4 ++++ drivers/gpu/drm/i915/intel_lrc.c | 6 ++++-- drivers/gpu/drm/i915/intel_ringbuffer.h | 21 +++++++++++++++++---- 7 files changed, 49 insertions(+), 18 deletions(-)
drivers/gpu/drm/i915/i915_debugfs.c +4 -4
@@ -3313,6 +3313,7 @@ static int i915_engine_info(struct seq_file *m, void *unused)if (i915.enable_execlists) {const u32 *hws = &engine->status_page.page_addr[I915_HWS_CSB_BUF0_INDEX ]; +struct intel_engine_execlist *const el = &engine->execlist;u32 ptr, read, write;unsigned int idx;
@@ -3346,11 +3347,10 @@ static int i915_engine_info(struct seq_file *m, void *unused) }rcu_read_lock (); -for (idx =0 ; idx <ARRAY_SIZE (engine->execlist.port); idx++) { +for (idx =0 ; idx <execlist_num_ports (el); idx++) {unsigned int count; - rq =port_unpack (&engine->execlist.port[idx], - &count); + rq =port_unpack (&el->port[idx], &count);if (rq) {seq_printf (m,"\t\tELSP[%d] count=%d, " , idx, count);
@@ -3363,7 +3363,7 @@ static int i915_engine_info(struct seq_file *m, void *unused)rcu_read_unlock ();spin_lock_irq (&engine->timeline->lock); -for (rb = engine->execlist.first; rb; rb =rb_next (rb)) { +for (rb = el->first; rb; rb =rb_next (rb)) {struct i915_priolist *p =rb_entry (rb,typeof (*p), node);
drivers/gpu/drm/i915/i915_drv.h +2 -1
@@ -1000,7 +1000,8 @@ struct i915_gpu_state {u32 seqno;u32 head;u32 tail; - } *requests, execlist[2 ]; + } *requests, execlist[EXECLIST_MAX_PORTS ]; +unsigned int num_ports;struct drm_i915_error_waiter {char comm[TASK_COMM_LEN ];
drivers/gpu/drm/i915/i915_gpu_error.c +12 -5
@@ -396,6 +396,8 @@ static void error_print_context(struct drm_i915_error_state_buf *m,static void error_print_engine (struct drm_i915_error_state_buf *m,const struct drm_i915_error_engine *ee) { +int n; +err_printf (m,"%s command stream:\n" ,engine_str (ee->engine_id));err_printf (m," START: 0x%08x\n" , ee->start);err_printf (m," HEAD: 0x%08x [0x%08x]\n" , ee->head, ee->rq_head);
@@ -465,8 +467,11 @@ static void error_print_engine(struct drm_i915_error_state_buf *m, jiffies_to_msecs(jiffies - ee->hangcheck_timestamp));err_printf (m," engine reset count: %u\n" , ee->reset_count); -error_print_request (m," ELSP[0]: " , &ee->execlist[0 ]); -error_print_request (m," ELSP[1]: " , &ee->execlist[1 ]); +for (n =0 ; n < ee->num_ports; n++) { +err_printf (m," ELSP[%d]:" , n); +error_print_request (m," " , &ee->execlist[n]); + } +error_print_context (m," Active context: " , &ee->context); }
@@ -1327,17 +1332,19 @@ static void engine_record_requests(struct intel_engine_cs *engine,static void error_record_engine_execlists (struct intel_engine_cs *engine,struct drm_i915_error_engine *ee) { -const struct execlist_port *port = engine->execlist.port; +const struct intel_engine_execlist *const el = &engine->execlist;unsigned int n; -for (n =0 ; n <ARRAY_SIZE (engine->execlist.port); n++) { -struct drm_i915_gem_request *rq =port_request (&port[n]); +for (n =0 ; n <execlist_num_ports (el); n++) { +struct drm_i915_gem_request *rq =port_request (&el->port[n]);if (!rq)break ;record_request (rq, &ee->execlist[n]); } + + ee->num_ports = n; } static void record_context(struct drm_i915_error_context *e,
drivers/gpu/drm/i915/i915_guc_submission.c +6 -2
@@ -562,6 +562,8 @@ static void i915_guc_dequeue(struct intel_engine_cs *engine)struct intel_engine_execlist *const el = &engine->execlist;struct execlist_port *port = el->port;struct drm_i915_gem_request *last =NULL ; +const struct execlist_port *const last_port = + &el->port[el->port_mask];bool submit = false;struct rb_node *rb;
@@ -577,7 +579,7 @@ static void i915_guc_dequeue(struct intel_engine_cs *engine)list_for_each_entry_safe (rq, rn, &p->requests, priotree.link) {if (last && rq->ctx != last->ctx) { -if (port != el->port) { +if (port == last_port) {__list_del_many (&p->requests, &rq->priotree.link); goto done;
@@ -617,6 +619,8 @@ static void i915_guc_irq_handler(unsigned long data)struct intel_engine_cs *const engine = (struct intel_engine_cs *)data;struct intel_engine_execlist *const el = &engine->execlist;struct execlist_port *port = el->port; +const struct execlist_port *const last_port = + &el->port[el->port_mask];struct drm_i915_gem_request *rq; rq =port_request (&port[0 ]);
@@ -629,7 +633,7 @@ static void i915_guc_irq_handler(unsigned long data) rq =port_request (&port[0 ]); } -if (!port_isset (&port[1 ])) +if (!port_isset (last_port))i915_guc_dequeue (engine); }
drivers/gpu/drm/i915/intel_engine_cs.c +4 -0
@@ -403,6 +403,10 @@ static void intel_engine_init_execlist(struct intel_engine_cs *engine) el->csb_use_mmio =csb_force_mmio (engine->i915); + engine->execlist.port_mask =1 ; +BUILD_BUG_ON_NOT_POWER_OF_2 (execlist_num_ports (&engine->execlist)); +GEM_BUG_ON (execlist_num_ports (&engine->execlist) >EXECLIST_MAX_PORTS ); + el->queue =RB_ROOT ; el->first =NULL ; }
drivers/gpu/drm/i915/intel_lrc.c +4 -2
@@ -399,7 +399,7 @@ static void execlists_submit_ports(struct intel_engine_cs *engine) engine->i915->regs +i915_mmio_reg_offset (RING_ELSP (engine));unsigned int n; -for (n =ARRAY_SIZE (engine->execlist.port); n--; ) { +for (n =execlist_num_ports (&engine->execlist); n--; ) {struct drm_i915_gem_request *rq;unsigned int count;u64 desc;
@@ -456,6 +456,8 @@ static void execlists_dequeue(struct intel_engine_cs *engine)struct drm_i915_gem_request *last;struct intel_engine_execlist *const el = &engine->execlist;struct execlist_port *port = el->port; +const struct execlist_port *const last_port = + &el->port[el->port_mask];struct rb_node *rb;bool submit = false;
@@ -515,7 +517,7 @@ static void execlists_dequeue(struct intel_engine_cs *engine)* combine this request with the last, then we * are done. */ -if (port != el->port) { +if (port == last_port) {__list_del_many (&p->requests, &rq->priotree.link); goto done;
drivers/gpu/drm/i915/intel_ringbuffer.h +17 -4
@@ -234,7 +234,14 @@ struct intel_engine_execlist {* @context_id: context ID for port */ GEM_DEBUG_DECL(u32 context_id); - } port[2 ]; + +#define EXECLIST_MAX_PORTS 2 + } port[EXECLIST_MAX_PORTS ]; + +/** +* @port_mask: number of execlist ports - 1 +*/ +unsigned int port_mask;/** * @queue: queue of requests, in priority lists
@@ -511,16 +518,22 @@ struct intel_engine_cs {u32 (*get_cmd_length_mask)(u32 cmd_header); }; +static inline unsigned int +execlist_num_ports (const struct intel_engine_execlist *const el) +{ +return el->port_mask +1 ; +} +static inline void execlist_port_complete (struct intel_engine_execlist *const el,struct execlist_port *const port) { -struct execlist_port *const port1 = &el->port[1 ]; +const unsigned int m = el->port_mask;GEM_BUG_ON (port_index (port, el) !=0 ); - *port = *port1; -memset (port1,0 ,sizeof (struct execlist_port )); +memmove (port, port +1 , m *sizeof (struct execlist_port )); +memset (port + m,0 ,sizeof (struct execlist_port )); } static inline unsigned int
Signature · 6 lines
2.11.0 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Re: [PATCH 5/8] drm/i915: Make execlist port count variable
Quoting Mika Kuoppala (2017-09-20 15:37:02)
Quoted 8 lines
As we emulate execlists on top of the GuC workqueue, it is not restricted to just 2 ports and we can increase that number arbitrarily to trade-off queue depth (i.e. scheduling latency) against pipeline bubbles.
v2: rebase. better commit msg (Chris)
Signed-off-by Mika Kuoppala <[email protected]>
-Chris
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
PATCH 6/8 drm/i915: Introduce execlist_port_* accessors
In reply to Mika KuoppalaInstead of trusting that first available port is at index 0, use accessor to hide this. This is a preparation for a following patches where head can be at arbitrary location in the port array.
v2: improved commit message, elsp_ready readability (Chris)
--- drivers/gpu/drm/i915/i915_debugfs.c | 16 +++++++---- drivers/gpu/drm/i915/i915_gpu_error.c | 4 +-- drivers/gpu/drm/i915/i915_guc_submission.c | 17 ++++++----- drivers/gpu/drm/i915/i915_irq.c | 2 +- drivers/gpu/drm/i915/intel_engine_cs.c | 2 +- drivers/gpu/drm/i915/intel_lrc.c | 42 +++++++++++++++------------ drivers/gpu/drm/i915/intel_ringbuffer.h | 46 ++++++++++++++++++++++++++---- 7 files changed, 87 insertions(+), 42 deletions(-)
drivers/gpu/drm/i915/i915_debugfs.c +10 -6
@@ -3348,16 +3348,20 @@ static int i915_engine_info(struct seq_file *m, void *unused)rcu_read_lock ();for (idx =0 ; idx <execlist_num_ports (el); idx++) { -unsigned int count; +const struct execlist_port *port; +unsigned int count, n; - rq =port_unpack (&el->port[idx], &count); + port =execlist_port_index (el, idx); + n =port_index (port, el); + + rq =port_unpack (port, &count);if (rq) { -seq_printf (m,"\t\tELSP[%d] count=%d, " , - idx, count); +seq_printf (m,"\t\tELSP[%d:%d] count=%d, " , + idx, n, count);print_request (m, rq,"rq: " ); }else { -seq_printf (m,"\t\tELSP[%d] idle\n" , - idx); +seq_printf (m,"\t\tELSP[%d:%d] idle\n" , + idx, n); } }rcu_read_unlock ();
drivers/gpu/drm/i915/i915_gpu_error.c +2 -2
@@ -1332,11 +1332,11 @@ static void engine_record_requests(struct intel_engine_cs *engine,static void error_record_engine_execlists (struct intel_engine_cs *engine,struct drm_i915_error_engine *ee) { -const struct intel_engine_execlist *const el = &engine->execlist; +struct intel_engine_execlist *const el = &engine->execlist;unsigned int n;for (n =0 ; n <execlist_num_ports (el); n++) { -struct drm_i915_gem_request *rq =port_request (&el->port[n]); +struct drm_i915_gem_request *rq =port_request (execlist_port_index (el, n));if (!rq)break ;
drivers/gpu/drm/i915/i915_guc_submission.c +8 -9
@@ -562,8 +562,7 @@ static void i915_guc_dequeue(struct intel_engine_cs *engine)struct intel_engine_execlist *const el = &engine->execlist;struct execlist_port *port = el->port;struct drm_i915_gem_request *last =NULL ; -const struct execlist_port *const last_port = - &el->port[el->port_mask]; +const struct execlist_port *const last_port =execlist_port_tail (el);bool submit = false;struct rb_node *rb;
@@ -587,7 +586,8 @@ static void i915_guc_dequeue(struct intel_engine_cs *engine)if (submit)port_assign (port, last); - port++; + + port =execlist_port_next (el, port); }INIT_LIST_HEAD (&rq->priotree.link);
@@ -618,19 +618,18 @@ static void i915_guc_irq_handler(unsigned long data) {struct intel_engine_cs *const engine = (struct intel_engine_cs *)data;struct intel_engine_execlist *const el = &engine->execlist; -struct execlist_port *port = el->port; -const struct execlist_port *const last_port = - &el->port[el->port_mask]; +struct execlist_port *port =execlist_port_head (el); +const struct execlist_port *const last_port =execlist_port_tail (el);struct drm_i915_gem_request *rq; - rq =port_request (&port[0 ]); + rq =port_request (port);while (rq &&i915_gem_request_completed (rq)) {trace_i915_gem_request_out (rq);i915_gem_request_put (rq); -execlist_port_complete (el, port); + port =execlist_port_complete (el, port); - rq =port_request (&port[0 ]); + rq =port_request (port); }if (!port_isset (last_port))
drivers/gpu/drm/i915/i915_irq.c +1 -1
@@ -1342,7 +1342,7 @@ gen8_cs_irq_handler(struct intel_engine_cs *engine, u32 iir, int test_shift)bool tasklet = false;if (iir & (GT_CONTEXT_SWITCH_INTERRUPT << test_shift)) { -if (port_count (&el->port[0 ])) { +if (port_count (execlist_port_head (el))) {__set_bit (ENGINE_IRQ_EXECLIST , &engine->irq_posted); tasklet = true; }
drivers/gpu/drm/i915/intel_engine_cs.c +1 -1
@@ -1502,7 +1502,7 @@ bool intel_engine_is_idle(struct intel_engine_cs *engine)return false;/* Both ports drained, no more ELSP submission? */ -if (port_request (&engine->execlist.port[0 ])) +if (port_request (execlist_port_head (&engine->execlist)))return false;/* ELSP is empty, but there are ready requests? */
drivers/gpu/drm/i915/intel_lrc.c +24 -18
119 lines not on this page · raw message
drivers/gpu/drm/i915/intel_ringbuffer.h +41 -5
63 lines not on this page · raw message
Signature · 6 lines
2.11.0 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Re: [PATCH 6/8] drm/i915: Introduce execlist_port_* accessors
Quoting Mika Kuoppala (2017-09-20 15:37:03)
Quoted 23 lines
Instead of trusting that first available port is at index 0, use accessor to hide this. This is a preparation for a following patches where head can be at arbitrary location in the port array.
v2: improved commit message,
elsp_readyreadability (Chris)Signed-off-by Mika Kuoppala <[email protected]>--- drivers/gpu/drm/i915/i915_debugfs.c | 16 +++++++---- drivers/gpu/drm/i915/i915_gpu_error.c | 4 +-- drivers/gpu/drm/i915/i915_guc_submission.c | 17 ++++++----- drivers/gpu/drm/i915/i915_irq.c | 2 +- drivers/gpu/drm/i915/intel_engine_cs.c | 2 +- drivers/gpu/drm/i915/intel_lrc.c | 42 +++++++++++++++------------ drivers/gpu/drm/i915/intel_ringbuffer.h | 46 ++++++++++++++++++++++++++---- 7 files changed, 87 insertions(+), 42 deletions(-)drivers/gpu/drm/i915/i915_debugfs.c +0
-0
drivers/gpu/drm/i915/i915_debugfs.c static int i915_engine_info(struct seq_file *m, void *unused) · line 3355
Quoted 10 lines
drivers/gpu/drm/i915/i915_debugfs.c +4
-2@@ -3348,16 +3348,20 @@ static int i915_engine_info(struct seq_file *m, void *unused)rcu_read_lock ();for (idx =0 ; idx <execlist_num_ports (el); idx++) { -unsigned int count; +const struct execlist_port *port; +unsigned int count, n; - rq =port_unpack (&el->port[idx], &count); + port =execlist_port_index (el, idx); + n =port_index (port, el);
Bah, execlist_port_index() implies to me that it should return the index, not the port. I would just call it execlist_port(). How does that look?
Quoted 12 lines
drivers/gpu/drm/i915/i915_debugfs.c +11
-1-static inline void +#define __port_idx (start, index, mask) (((start) + (index)) & (mask)) + +static inline struct execlist_port * +execlist_port_head (struct intel_engine_execlist *const el) +{ +return &el->port[el->port_head]; +} + +/* Index starting from port_head */ +static inline struct execlist_port * +execlist_port_index(struct intel_engine_execlist * const el,
drivers/gpu/drm/i915/i915_debugfs.c static int i915_engine_info(struct seq_file *m, void *unused)
Quoted 10 lines
drivers/gpu/drm/i915/i915_debugfs.c +10
-0+ const unsigned int n) +{ +return &el->port[__port_idx (el->port_head, n, el->port_mask)]; +} + +static inline struct execlist_port * +execlist_port_tail (struct intel_engine_execlist *const el) +{ +return &el->port[__port_idx (el->port_head,-1 , el->port_mask)]; +}
Hmm, I was expecting
execlist_port_head() { return execlist_port(el, 0); } execlist_port_tail() { return execlist_port(el, -1); }
What's the impact on object size? (As a quick guide to how much the compiler can keep the code in check.)
-Chris
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Re: [PATCH 6/8] drm/i915: Introduce execlist_port_* accessors
Quoted 31 lines · Chris Wilson
Quoting Mika Kuoppala (2017-09-20 15:37:03)
Quoted 30 lines
Instead of trusting that first available port is at index 0, use accessor to hide this. This is a preparation for a following patches where head can be at arbitrary location in the port array.
v2: improved commit message,
elsp_readyreadability (Chris)Signed-off-by Mika Kuoppala <[email protected]>--- drivers/gpu/drm/i915/i915_debugfs.c | 16 +++++++---- drivers/gpu/drm/i915/i915_gpu_error.c | 4 +-- drivers/gpu/drm/i915/i915_guc_submission.c | 17 ++++++----- drivers/gpu/drm/i915/i915_irq.c | 2 +- drivers/gpu/drm/i915/intel_engine_cs.c | 2 +- drivers/gpu/drm/i915/intel_lrc.c | 42 +++++++++++++++------------ drivers/gpu/drm/i915/intel_ringbuffer.h | 46 ++++++++++++++++++++++++++---- 7 files changed, 87 insertions(+), 42 deletions(-)drivers/gpu/drm/i915/i915_debugfs.c +2
-1@@ -3348,16 +3348,20 @@ static int i915_engine_info(struct seq_file *m, void *unused)rcu_read_lock ();for (idx =0 ; idx <execlist_num_ports (el); idx++) { -unsigned int count; +const struct execlist_port *port; +unsigned int count, n;
Quoted 7 lines
drivers/gpu/drm/i915/i915_debugfs.c static int i915_engine_info(struct seq_file *m, void *unused) · line 3355
Quoted 3 lines
drivers/gpu/drm/i915/i915_debugfs.c +2
-1- rq =port_unpack (&el->port[idx], &count); + port =execlist_port_index (el, idx); + n =port_index (port, el);Bah,
execlist_port_index()implies to me that it should return the index, not the port. I would just call itexeclist_port(). How does that look?
It looks much better.
Quoted 26 lines
Quoted 13 lines
drivers/gpu/drm/i915/i915_debugfs.c +11
-1-static inline void +#define __port_idx (start, index, mask) (((start) + (index)) & (mask)) + +static inline struct execlist_port * +execlist_port_head (struct intel_engine_execlist *const el) +{ +return &el->port[el->port_head]; +} + +/* Index starting from port_head */ +static inline struct execlist_port * +execlist_port_index(struct intel_engine_execlist * const el,drivers/gpu/drm/i915/i915_debugfs.c static int i915_engine_info(struct seq_file *m, void *unused)
Quoted 10 lines
drivers/gpu/drm/i915/i915_debugfs.c +10
-0+ const unsigned int n) +{ +return &el->port[__port_idx (el->port_head, n, el->port_mask)]; +} + +static inline struct execlist_port * +execlist_port_tail (struct intel_engine_execlist *const el) +{ +return &el->port[__port_idx (el->port_head,-1 , el->port_mask)]; +}Hmm, I was expecting
Quoted 2 lines
execlist_port_head(){ returnexeclist_port(el, 0); }execlist_port_tail(){ returnexeclist_port(el, -1); }
Seems that I did these on the next patch, moved to here.
Quoted 3 lines
What's the impact on object size? (As a quick guide to how much the compiler can keep the code in check.)
I can't say what would constitute as a still in check, but things grow:
add/remove: 0/0 grow/shrink: 6/1 up/down: 277/-26 (251)
function old new delta
intel_lrc_irq_handler 1591 1700 +109 i915_guc_irq_handler 1041 1110 +69 i915_engine_info 1983 2031 +48 insert_request 127 152 +25 intel_engine_is_idle 304 317 +13 gen8_cs_irq_handler 113 126 +13 capture 5454 5428 -26
Total: Before=1144612, After=1144863, chg +0.02%
-Mika
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
PATCH 7/8 drm/i915: Keep track of reserved execlist ports
In reply to Mika KuoppalaTo further enchance port processing, keep track of reserved ports. This way we can iterate only the used subset of port space. Note that we lift the responsibility of execlists_submit_request() to inspect hw availability and always do dequeuing. This is to ensure that only the irq handler will be responsible for keeping track of available ports.
v2: rebase, comment fix, READ_ONCE only outside of irq handler (Chris)
--- drivers/gpu/drm/i915/i915_guc_submission.c | 51 +++++++++-------- drivers/gpu/drm/i915/i915_irq.c | 2 +- drivers/gpu/drm/i915/intel_engine_cs.c | 7 ++- drivers/gpu/drm/i915/intel_lrc.c | 90 ++++++++++++++++++------------ drivers/gpu/drm/i915/intel_ringbuffer.h | 55 +++++++++++++----- 5 files changed, 129 insertions(+), 76 deletions(-)
drivers/gpu/drm/i915/i915_guc_submission.c +28 -23
@@ -487,7 +487,7 @@ static void guc_ring_doorbell(struct i915_guc_client *client)* @engine: engine associated with the commands * * The only error here arises if the doorbell hardware isn't functioning -* as expected, which really shouln't happen. +* as expected, which really shouldn't happen. */ static void i915_guc_submit (struct intel_engine_cs *engine) {
@@ -495,17 +495,19 @@ static void i915_guc_submit(struct intel_engine_cs *engine)struct intel_guc *guc = &dev_priv->guc;struct i915_guc_client *client = guc->execbuf_client;struct intel_engine_execlist *const el = &engine->execlist; -struct execlist_port *port = el->port;const unsigned int engine_id = engine->id;unsigned int n; -for (n =0 ; n <ARRAY_SIZE (el->port); n++) { +for (n =0 ; n <execlist_active_ports (el); n++) { +struct execlist_port *port;struct drm_i915_gem_request *rq;unsigned int count; - rq =port_unpack (&port[n], &count); + port =execlist_port_index (el, n); + + rq =port_unpack (port, &count);if (rq && count ==0 ) { -port_set (&port[n],port_pack (rq, ++count)); +port_set (port,port_pack (rq, ++count));if (i915_vma_is_map_and_fenceable (rq->ring->vma))POSTING_READ_FW (GUC_STATUS );
@@ -560,25 +562,27 @@ static void port_assign(struct execlist_port *port,static void i915_guc_dequeue (struct intel_engine_cs *engine) {struct intel_engine_execlist *const el = &engine->execlist; -struct execlist_port *port = el->port; +struct execlist_port *port;struct drm_i915_gem_request *last =NULL ; -const struct execlist_port *const last_port =execlist_port_tail (el);bool submit = false;struct rb_node *rb; -if (port_isset (port)) - port++; -spin_lock_irq (&engine->timeline->lock); rb = el->first;GEM_BUG_ON (rb_first (&el->queue) != rb); -while (rb) { + +if (unlikely (!rb)) + goto done; + + port =execlist_request_port (el); + + do { struct i915_priolist *p = rb_entry(rb, typeof(*p), node); struct drm_i915_gem_request *rq, *rn; list_for_each_entry_safe(rq, rn, &p->requests, priotree.link) { if (last && rq->ctx != last->ctx) { -if (port == last_port) { + if (!execlist_inactive_ports(el)) { __list_del_many(&p->requests, &rq->priotree.link); goto done;
@@ -587,7 +591,8 @@ static void i915_guc_dequeue(struct intel_engine_cs *engine)if (submit)port_assign (port, last); - port =execlist_port_next (el, port); + port =execlist_request_port (el); +GEM_BUG_ON (port_isset (port)); }INIT_LIST_HEAD (&rq->priotree.link);
@@ -604,7 +609,7 @@ static void i915_guc_dequeue(struct intel_engine_cs *engine)INIT_LIST_HEAD (&p->requests);if (p->priority !=I915_PRIORITY_NORMAL )kmem_cache_free (engine->i915->priorities, p); - } + }while (rb); done: el->first = rb;if (submit) {
@@ -618,21 +623,21 @@ static void i915_guc_irq_handler(unsigned long data) {struct intel_engine_cs *const engine = (struct intel_engine_cs *)data;struct intel_engine_execlist *const el = &engine->execlist; -struct execlist_port *port =execlist_port_head (el); -const struct execlist_port *const last_port =execlist_port_tail (el); -struct drm_i915_gem_request *rq; - rq =port_request (port); -while (rq &&i915_gem_request_completed (rq)) { +while (execlist_active_ports (el)) { +struct execlist_port *port =execlist_port_head (el); +struct drm_i915_gem_request *rq =port_request (port); + +if (!i915_gem_request_completed (rq)) +break ; +trace_i915_gem_request_out (rq);i915_gem_request_put (rq); - port =execlist_port_complete (el, port); - - rq =port_request (port); +execlist_release_port (el, port); } -if (!port_isset (last_port)) +if (execlist_inactive_ports (el))i915_guc_dequeue (engine); }
drivers/gpu/drm/i915/i915_irq.c +1 -1
@@ -1342,7 +1342,7 @@ gen8_cs_irq_handler(struct intel_engine_cs *engine, u32 iir, int test_shift)bool tasklet = false;if (iir & (GT_CONTEXT_SWITCH_INTERRUPT << test_shift)) { -if (port_count (execlist_port_head (el))) { +if (READ_ONCE (el->port_count)) {__set_bit (ENGINE_IRQ_EXECLIST , &engine->irq_posted); tasklet = true; }
drivers/gpu/drm/i915/intel_engine_cs.c +5 -2
@@ -407,6 +407,9 @@ static void intel_engine_init_execlist(struct intel_engine_cs *engine)BUILD_BUG_ON_NOT_POWER_OF_2 (execlist_num_ports (&engine->execlist));GEM_BUG_ON (execlist_num_ports (&engine->execlist) >EXECLIST_MAX_PORTS ); + el->port_head =0 ; + el->port_count =0 ; + el->queue =RB_ROOT ; el->first =NULL ; }
@@ -1501,8 +1504,8 @@ bool intel_engine_is_idle(struct intel_engine_cs *engine)if (test_bit (ENGINE_IRQ_EXECLIST , &engine->irq_posted))return false; -/* Both ports drained, no more ELSP submission? */ -if (port_request (execlist_port_head (&engine->execlist))) +/* All ports drained, no more ELSP submission? */ +if (execlist_active_ports (&engine->execlist))return false;/* ELSP is empty, but there are ready requests? */
drivers/gpu/drm/i915/intel_lrc.c +54 -36
193 lines not on this page · raw message
drivers/gpu/drm/i915/intel_ringbuffer.h +41 -14
91 lines not on this page · raw message
Signature · 6 lines
2.11.0 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Re: [PATCH 7/8] drm/i915: Keep track of reserved execlist ports
Quoted 4 lines · Mika Kuoppala
To further enchance port processing, keep track of reserved ports. This way we can iterate only the used subset of port space. Note that we lift the responsibility of
execlists_submit_request()to inspect hw availability and
s/execlist_submit_request/insert_request.
-Mika
Quoted 487 lines
always do dequeuing. This is to ensure that only the irq handler will be responsible for keeping track of available ports.
v2: rebase, comment fix,
READ_ONCEonly outside of irq handler (Chris)Cc Chris Wilson <[email protected]>Cc Michał Winiarski <[email protected]>Signed-off-by Mika Kuoppala <[email protected]>--- drivers/gpu/drm/i915/i915_guc_submission.c | 51 +++++++++-------- drivers/gpu/drm/i915/i915_irq.c | 2 +- drivers/gpu/drm/i915/intel_engine_cs.c | 7 ++- drivers/gpu/drm/i915/intel_lrc.c | 90 ++++++++++++++++++------------ drivers/gpu/drm/i915/intel_ringbuffer.h | 55 +++++++++++++----- 5 files changed, 129 insertions(+), 76 deletions(-)drivers/gpu/drm/i915/i915_guc_submission.c +28
-23@@ -487,7 +487,7 @@ static void guc_ring_doorbell(struct i915_guc_client *client)* @engine: engine associated with the commands * * The only error here arises if the doorbell hardware isn't functioning -* as expected, which really shouln't happen. +* as expected, which really shouldn't happen. */ static void i915_guc_submit (struct intel_engine_cs *engine) {@@ -495,17 +495,19 @@ static void i915_guc_submit(struct intel_engine_cs *engine)struct intel_guc *guc = &dev_priv->guc;struct i915_guc_client *client = guc->execbuf_client;struct intel_engine_execlist *const el = &engine->execlist; -struct execlist_port *port = el->port;const unsigned int engine_id = engine->id;unsigned int n; -for (n =0 ; n <ARRAY_SIZE (el->port); n++) { +for (n =0 ; n <execlist_active_ports (el); n++) { +struct execlist_port *port;struct drm_i915_gem_request *rq;unsigned int count; - rq =port_unpack (&port[n], &count); + port =execlist_port_index (el, n); + + rq =port_unpack (port, &count);if (rq && count ==0 ) { -port_set (&port[n],port_pack (rq, ++count)); +port_set (port,port_pack (rq, ++count));if (i915_vma_is_map_and_fenceable (rq->ring->vma))POSTING_READ_FW (GUC_STATUS );@@ -560,25 +562,27 @@ static void port_assign(struct execlist_port *port,static void i915_guc_dequeue (struct intel_engine_cs *engine) {struct intel_engine_execlist *const el = &engine->execlist; -struct execlist_port *port = el->port; +struct execlist_port *port;struct drm_i915_gem_request *last =NULL ; -const struct execlist_port *const last_port =execlist_port_tail (el);bool submit = false;struct rb_node *rb; -if (port_isset (port)) - port++; -spin_lock_irq (&engine->timeline->lock); rb = el->first;GEM_BUG_ON (rb_first (&el->queue) != rb); -while (rb) { + +if (unlikely (!rb)) + goto done; + + port =execlist_request_port (el); + + do { struct i915_priolist *p = rb_entry(rb, typeof(*p), node); struct drm_i915_gem_request *rq, *rn; list_for_each_entry_safe(rq, rn, &p->requests, priotree.link) { if (last && rq->ctx != last->ctx) { -if (port == last_port) { + if (!execlist_inactive_ports(el)) { __list_del_many(&p->requests, &rq->priotree.link); goto done;@@ -587,7 +591,8 @@ static void i915_guc_dequeue(struct intel_engine_cs *engine)if (submit)port_assign (port, last); - port =execlist_port_next (el, port); + port =execlist_request_port (el); +GEM_BUG_ON (port_isset (port)); }INIT_LIST_HEAD (&rq->priotree.link);@@ -604,7 +609,7 @@ static void i915_guc_dequeue(struct intel_engine_cs *engine)INIT_LIST_HEAD (&p->requests);if (p->priority !=I915_PRIORITY_NORMAL )kmem_cache_free (engine->i915->priorities, p); - } + }while (rb); done: el->first = rb;if (submit) {@@ -618,21 +623,21 @@ static void i915_guc_irq_handler(unsigned long data) {struct intel_engine_cs *const engine = (struct intel_engine_cs *)data;struct intel_engine_execlist *const el = &engine->execlist; -struct execlist_port *port =execlist_port_head (el); -const struct execlist_port *const last_port =execlist_port_tail (el); -struct drm_i915_gem_request *rq; - rq =port_request (port); -while (rq &&i915_gem_request_completed (rq)) { +while (execlist_active_ports (el)) { +struct execlist_port *port =execlist_port_head (el); +struct drm_i915_gem_request *rq =port_request (port); + +if (!i915_gem_request_completed (rq)) +break ; +trace_i915_gem_request_out (rq);i915_gem_request_put (rq); - port =execlist_port_complete (el, port); - - rq =port_request (port); +execlist_release_port (el, port); } -if (!port_isset (last_port)) +if (execlist_inactive_ports (el))i915_guc_dequeue (engine); }drivers/gpu/drm/i915/i915_irq.c +1
-1@@ -1342,7 +1342,7 @@ gen8_cs_irq_handler(struct intel_engine_cs *engine, u32 iir, int test_shift)bool tasklet = false;if (iir & (GT_CONTEXT_SWITCH_INTERRUPT << test_shift)) { -if (port_count (execlist_port_head (el))) { +if (READ_ONCE (el->port_count)) {__set_bit (ENGINE_IRQ_EXECLIST , &engine->irq_posted); tasklet = true; }drivers/gpu/drm/i915/intel_engine_cs.c +5
-2@@ -407,6 +407,9 @@ static void intel_engine_init_execlist(struct intel_engine_cs *engine)BUILD_BUG_ON_NOT_POWER_OF_2 (execlist_num_ports (&engine->execlist));GEM_BUG_ON (execlist_num_ports (&engine->execlist) >EXECLIST_MAX_PORTS ); + el->port_head =0 ; + el->port_count =0 ; + el->queue =RB_ROOT ; el->first =NULL ; }@@ -1501,8 +1504,8 @@ bool intel_engine_is_idle(struct intel_engine_cs *engine)if (test_bit (ENGINE_IRQ_EXECLIST , &engine->irq_posted))return false; -/* Both ports drained, no more ELSP submission? */ -if (port_request (execlist_port_head (&engine->execlist))) +/* All ports drained, no more ELSP submission? */ +if (execlist_active_ports (&engine->execlist))return false;/* ELSP is empty, but there are ready requests? */ drivers/gpu/drm/i915/intel_lrc.c +54
-36@@ -399,26 +399,29 @@ static void execlists_submit_ports(struct intel_engine_cs *engine) engine->i915->regs +i915_mmio_reg_offset (RING_ELSP (engine));unsigned int n; -for (n =execlist_num_ports (el); n--; ) { -struct execlist_port *port; +for (n =0 ; n <execlist_inactive_ports (el); n++) { +writel (0 , elsp); +writel (0 , elsp); + } + +for (n =execlist_active_ports (el); n--; ) {struct drm_i915_gem_request *rq; +struct execlist_port *port;unsigned int count;u64 desc; port =execlist_port_index (el, n); - rq =port_unpack (port, &count); -if (rq) { -GEM_BUG_ON (count > !n); -if (!count++) -execlists_context_status_change (rq,INTEL_CONTEXT_SCHEDULE_IN ); -port_set (port,port_pack (rq, count)); - desc =execlists_update_context (rq); -GEM_DEBUG_EXEC (port->context_id =upper_32_bits (desc)); - }else { -GEM_BUG_ON (!n); - desc =0 ; - } + +GEM_BUG_ON (!rq); +GEM_BUG_ON (count > !n); + +if (!count++) +execlists_context_status_change (rq,INTEL_CONTEXT_SCHEDULE_IN ); + +port_set (port,port_pack (rq, count)); + desc =execlists_update_context (rq); +GEM_DEBUG_EXEC (port->context_id =upper_32_bits (desc));writel (upper_32_bits (desc), elsp);writel (lower_32_bits (desc), elsp);@@ -456,15 +459,23 @@ static void port_assign(struct execlist_port *port,static void execlists_dequeue (struct intel_engine_cs *engine) { -struct drm_i915_gem_request *last;struct intel_engine_execlist *const el = &engine->execlist; -struct execlist_port *port =execlist_port_head (el); -const struct execlist_port *const last_port =execlist_port_tail (el); +struct execlist_port *port; +struct drm_i915_gem_request *last;struct rb_node *rb;bool submit = false; - last =port_request (port); -if (last) +spin_lock_irq (&engine->timeline->lock); + rb = el->first; +GEM_BUG_ON (rb_first (&el->queue) != rb); + +if (unlikely (!rb)) + goto done; + +if (execlist_active_ports (el)) { + port =execlist_port_tail (el); + last =port_request (port); +/* WaIdleLiteRestore:bdw,skl * Apply the wa NOOPs to prevent ring:HEAD == req:TAIL * as we resubmit the request. See gen8_emit_breadcrumb() @@ -472,6 +483,11 @@ static void execlists_dequeue(struct intel_engine_cs *engine)* request. */ last->tail = last->wa_tail; + }else { +/* Allocate first port to coalesce into */ + port =execlist_request_port (el); + last =NULL ; + }/* Hardware submission is through 2 ports. Conceptually each port * has a (RING_START, RING_HEAD, RING_TAIL) tuple. RING_START is @@ -493,11 +509,7 @@ static void execlists_dequeue(struct intel_engine_cs *engine)* sequence of requests as being the most optimal (fewest wake ups * and context switches) submission. */ - -spin_lock_irq (&engine->timeline->lock); - rb = el->first; -GEM_BUG_ON (rb_first (&el->queue) != rb); -while (rb) { + do { struct i915_priolist *p = rb_entry(rb, typeof(*p), node); struct drm_i915_gem_request *rq, *rn;@@ -515,11 +527,11 @@ static void execlists_dequeue(struct intel_engine_cs *engine)*/ if (last && !can_merge_ctx (rq->ctx, last->ctx)) {/* -* If we are on the second port and cannot +* If we are on the last port and cannot * combine this request with the last, then we * are done. */ -if (port == last_port) { +if (!execlist_inactive_ports (el)) {__list_del_many (&p->requests, &rq->priotree.link); goto done;@@ -544,8 +556,7 @@ static void execlists_dequeue(struct intel_engine_cs *engine)if (submit)port_assign (port, last); - port =execlist_port_next (el, port); - + port =execlist_request_port (el);GEM_BUG_ON (port_isset (port)); }@@ -563,7 +574,8 @@ static void execlists_dequeue(struct intel_engine_cs *engine)INIT_LIST_HEAD (&p->requests);if (p->priority !=I915_PRIORITY_NORMAL )kmem_cache_free (engine->i915->priorities, p); - } + }while (rb); + done: el->first = rb;if (submit)@@ -582,6 +594,9 @@ static void execlist_cancel_port_requests(struct intel_engine_execlist *el)i915_gem_request_put (port_request (&el->port[i]));memset (el->port,0 ,sizeof (el->port)); + + el->port_count =0 ; + el->port_head =0 ; }static void execlists_cancel_requests (struct intel_engine_cs *engine)@@ -643,10 +658,12 @@ static void execlists_cancel_requests(struct intel_engine_cs *engine)static bool execlists_elsp_ready (struct intel_engine_execlist *const el) { -struct execlist_port *const port0 =execlist_port_head (el); -struct execlist_port *const port1 =execlist_port_next (el, port0); +const unsigned int active =execlist_active_ports (el); + +if (!active) +return true; -return port_count (port0) +port_count (port1) <2 ; +return port_count (execlist_port_tail (el)) + active <2 ; }/* @@ -657,7 +674,6 @@ static void intel_lrc_irq_handler(unsigned long data) {struct intel_engine_cs *const engine = (struct intel_engine_cs *)data;struct intel_engine_execlist *const el = &engine->execlist; -struct execlist_port *port =execlist_port_head (el);struct drm_i915_private *dev_priv = engine->i915;/* We can skip acquiring intel_runtime_pm_get() here as it was taken @@ -714,6 +730,7 @@ static void intel_lrc_irq_handler(unsigned long data) }while (head != tail) { +struct execlist_port *port;struct drm_i915_gem_request *rq;unsigned int status;unsigned int count;@@ -742,6 +759,7 @@ static void intel_lrc_irq_handler(unsigned long data)if (!(status &GEN8_CTX_STATUS_COMPLETED_MASK ))continue ; + port =execlist_port_head (el);/* Check the context/desc id for this event matches */ GEM_DEBUG_BUG_ON (buf[2 * head +1 ] != port->context_id);@@ -755,13 +773,13 @@ static void intel_lrc_irq_handler(unsigned long data)trace_i915_gem_request_out (rq);i915_gem_request_put (rq); - port =execlist_port_complete (el, port); +execlist_release_port (el, port); }else {port_set (port,port_pack (rq, count)); }/* After the final element, the hw should be idle */ -GEM_BUG_ON (port_count (port) ==0 && +GEM_BUG_ON (execlist_active_ports (el) ==0 && !(status &GEN8_CTX_STATUS_ACTIVE_IDLE )); }@@ -786,7 +804,7 @@ static void insert_request(struct intel_engine_cs *engine,struct i915_priolist *p =lookup_priolist (engine, pt, prio);list_add_tail (&pt->link, &ptr_mask_bits (p,1 )->requests); -if (ptr_unmask_bits (p,1 ) &&execlists_elsp_ready (el)) +if (ptr_unmask_bits (p,1 ))tasklet_hi_schedule (&el->irq_tasklet); }drivers/gpu/drm/i915/intel_ringbuffer.h +41
-14@@ -249,6 +249,11 @@ struct intel_engine_execlist {unsigned int port_head;/** +* @port_count: reserved ports +*/ +unsigned int port_count; + +/** * @queue: queue of requests, in priority lists */ struct rb_root queue;@@ -529,14 +534,20 @@ execlist_num_ports(const struct intel_engine_execlist * const el)return el->port_mask +1 ; } -#define __port_idx (start, index, mask) (((start) + (index)) & (mask)) +static inline unsigned int +execlist_active_ports (const struct intel_engine_execlist *const el) +{ +return el->port_count; +} -static inline struct execlist_port * -execlist_port_head (struct intel_engine_execlist *const el) +static inline unsigned int +execlist_inactive_ports (const struct intel_engine_execlist *const el) { -return &el->port[el->port_head]; +return execlist_num_ports (el) -execlist_active_ports (el); } +#define __port_idx (start, index, mask) (((start) + (index)) & (mask)) +/* Index starting from port_head */ static inline struct execlist_port * execlist_port_index(struct intel_engine_execlist * const el,@@ -546,30 +557,46 @@ execlist_port_index(struct intel_engine_execlist * const el, }static inline struct execlist_port * -execlist_port_tail (struct intel_engine_execlist *const el) +execlist_port_head (struct intel_engine_execlist *const el) { -return &el->port[__port_idx (el->port_head,-1 , el->port_mask)]; +GEM_BUG_ON (!el->port_count); + +return execlist_port_index (el,0 ); }static inline struct execlist_port * -execlist_port_next (struct intel_engine_execlist *const el, -const struct execlist_port *const port) +execlist_port_tail (struct intel_engine_execlist *const el) { -const unsigned int i =port_index (port, el); +GEM_BUG_ON (!el->port_count); -return &el->port[__port_idx (i,1 , el->port_mask)]; +return execlist_port_index (el, el->port_count -1 ); }static inline struct execlist_port * -execlist_port_complete (struct intel_engine_execlist *const el, -struct execlist_port *const port) +execlist_request_port (struct intel_engine_execlist *const el) { +GEM_BUG_ON (el->port_count == el->port_mask +1 ); + + el->port_count++; + +GEM_BUG_ON (port_isset (execlist_port_tail (el))); + +return execlist_port_tail (el); +} + +static inline void +execlist_release_port (struct intel_engine_execlist *const el, +struct execlist_port *const port) +{ +GEM_BUG_ON (port_index (port, el) != el->port_head); +GEM_BUG_ON (!port_isset (port)); +GEM_BUG_ON (!el->port_count);memset (port,0 ,sizeof (struct execlist_port )); - el->port_head =__port_idx (el->port_head,1 , el->port_mask); -return execlist_port_head (el); + el->port_head =__port_idx (el->port_head,1 , el->port_mask); + el->port_count--; } static inline unsigned intSignature · 1 line
2.11.0
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Re: [PATCH 7/8] drm/i915: Keep track of reserved execlist ports
In reply to Mika KuoppalaQuoting Mika Kuoppala (2017-09-20 15:37:04)
Quoted 7 lines
To further enchance port processing, keep track of reserved ports. This way we can iterate only the used subset of port space. Note that we lift the responsibility of
execlists_submit_request()to inspect hw availability and always do dequeuing. This is to ensure that only the irq handler will be responsible for keeping track of available ports.
Quoted 5 lines
v2: rebase, comment fix,
READ_ONCEonly outside of irq handler (Chris)Cc Chris Wilson <[email protected]>Cc Michał Winiarski <[email protected]>Signed-off-by Mika Kuoppala <[email protected]>
Ok, doesn't look hideous. I need to look at it with a clear head, but for now, could you check scripts/bloat-o-meter for my usual quick guide on how much gcc likes it?
-Chris
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
PATCH 8/8 drm/i915: Improve GuC request coalescing
In reply to Mika KuoppalaNow that we can keep track of what ports we have dequeued, coalesce only those ports instead of iterating through all ports.
--- drivers/gpu/drm/i915/i915_guc_submission.c | 31 +++++++++++++++++------------- drivers/gpu/drm/i915/intel_ringbuffer.h | 9 +++++++++ 2 files changed, 27 insertions(+), 13 deletions(-)
drivers/gpu/drm/i915/i915_guc_submission.c +18 -13
@@ -485,11 +485,13 @@ static void guc_ring_doorbell(struct i915_guc_client *client)/** * i915_guc_submit() - Submit commands through GuC * @engine: engine associated with the commands +* @first: index of first execlist port to start coalescing from * * The only error here arises if the doorbell hardware isn't functioning * as expected, which really shouldn't happen. */ -static void i915_guc_submit (struct intel_engine_cs *engine) +static void i915_guc_submit (struct intel_engine_cs *engine, +const unsigned int first) {struct drm_i915_private *dev_priv = engine->i915;struct intel_guc *guc = &dev_priv->guc;
@@ -498,7 +500,7 @@ static void i915_guc_submit(struct intel_engine_cs *engine)const unsigned int engine_id = engine->id;unsigned int n; -for (n =0 ; n <execlist_active_ports (el); n++) { +for (n = first; n <execlist_active_ports (el); n++) {struct execlist_port *port;struct drm_i915_gem_request *rq;unsigned int count;
@@ -506,21 +508,22 @@ static void i915_guc_submit(struct intel_engine_cs *engine) port =execlist_port_index (el, n); rq =port_unpack (port, &count); -if (rq && count ==0 ) { -port_set (port,port_pack (rq, ++count)); +GEM_BUG_ON (!rq); +GEM_BUG_ON (count); -if (i915_vma_is_map_and_fenceable (rq->ring->vma)) -POSTING_READ_FW (GUC_STATUS ); +port_set (port,port_pack (rq, ++count)); -spin_lock (&client->wq_lock); +if (i915_vma_is_map_and_fenceable (rq->ring->vma)) +POSTING_READ_FW (GUC_STATUS ); -guc_wq_item_append (client, rq); -guc_ring_doorbell (client); +spin_lock (&client->wq_lock); - client->submissions[engine_id] +=1 ; +guc_wq_item_append (client, rq); +guc_ring_doorbell (client); -spin_unlock (&client->wq_lock); - } + client->submissions[engine_id] +=1 ; + +spin_unlock (&client->wq_lock); } }
@@ -566,6 +569,7 @@ static void i915_guc_dequeue(struct intel_engine_cs *engine)struct drm_i915_gem_request *last =NULL ;bool submit = false;struct rb_node *rb; +unsigned int first_idx;spin_lock_irq (&engine->timeline->lock); rb = el->first;
@@ -575,6 +579,7 @@ static void i915_guc_dequeue(struct intel_engine_cs *engine) goto done; port =execlist_request_port (el); + first_idx =execlist_get_port_index (el, port); do { struct i915_priolist *p = rb_entry(rb, typeof(*p), node);
@@ -614,7 +619,7 @@ static void i915_guc_dequeue(struct intel_engine_cs *engine) el->first = rb;if (submit) {port_assign (port, last); -i915_guc_submit (engine); +i915_guc_submit (engine, first_idx); }spin_unlock_irq (&engine->timeline->lock); }
drivers/gpu/drm/i915/intel_ringbuffer.h +9 -0
@@ -556,6 +556,15 @@ execlist_port_index(struct intel_engine_execlist * const el,return &el->port[__port_idx (el->port_head, n, el->port_mask)]; } +static inline unsigned int +execlist_get_port_index (const struct intel_engine_execlist *const el, +const struct execlist_port *const port) +{ +const unsigned int n =port_index (port, el); + +return __port_idx (n, -el->port_head, el->port_mask); +} +static inline struct execlist_port *execlist_port_head (struct intel_engine_execlist *const el) {
Signature · 6 lines
2.11.0 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Re: [PATCH 8/8] drm/i915: Improve GuC request coalescing
Quoting Mika Kuoppala (2017-09-20 15:37:05)
Quoted 17 lines
drivers/gpu/drm/i915/i915_guc_submission.c +3
-2-static void i915_guc_submit (struct intel_engine_cs *engine) +static void i915_guc_submit (struct intel_engine_cs *engine, +const unsigned int first) {struct drm_i915_private *dev_priv = engine->i915;struct intel_guc *guc = &dev_priv->guc;@@ -498,7 +500,7 @@ static void i915_guc_submit(struct intel_engine_cs *engine)const unsigned int engine_id = engine->id;unsigned int n; -for (n =0 ; n <execlist_active_ports (el); n++) { +for (n = first; n <execlist_active_ports (el); n++) {struct execlist_port *port;struct drm_i915_gem_request *rq;unsigned int count;@@ -506,21 +508,22 @@ static void i915_guc_submit(struct intel_engine_cs *engine) port =execlist_port_index (el, n);
drivers/gpu/drm/i915/i915_guc_submission.c static void i915_guc_submit(struct intel_engine_cs *engine) · line 514
Quoted 10 lines
drivers/gpu/drm/i915/i915_guc_submission.c +3
-4rq =port_unpack (port, &count); -if (rq && count ==0 ) { -port_set (port,port_pack (rq, ++count)); +GEM_BUG_ON (!rq); +GEM_BUG_ON (count); -if (i915_vma_is_map_and_fenceable (rq->ring->vma)) -POSTING_READ_FW (GUC_STATUS ); +port_set (port,port_pack (rq, ++count));
Ok, with this method we don't need count anymore. Seems sensible. -Chris
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Re: [PATCH 8/8] drm/i915: Improve GuC request coalescing
In reply to Mika KuoppalaQuoted 3 lines · Mika Kuoppala
Now that we can keep track of what ports we have dequeued, coalesce only those ports instead of iterating through all ports.
s/coalesce/submit.
By coalescing I meant that we're no longer have a 1:1 relationship between a request and GuC workitem. But we're doing that in guc_dequeue by keeping the request-to-be-turned-into-workitem in port.
Quoted 14 lines
Cc Michał Winiarski <[email protected]>Cc Chris Wilson <[email protected]>Signed-off-by Mika Kuoppala <[email protected]>--- drivers/gpu/drm/i915/i915_guc_submission.c | 31 +++++++++++++++++------------- drivers/gpu/drm/i915/intel_ringbuffer.h | 9 +++++++++ 2 files changed, 27 insertions(+), 13 deletions(-)drivers/gpu/drm/i915/i915_guc_submission.c +0
-0
drivers/gpu/drm/i915/i915_guc_submission.c static void guc_ring_doorbell(struct i915_guc_client *client) · line 488
Quoted 4 lines
drivers/gpu/drm/i915/i915_guc_submission.c +1
-0@@ -485,11 +485,13 @@ static void guc_ring_doorbell(struct i915_guc_client *client)/** * i915_guc_submit() - Submit commands through GuC * @engine: engine associated with the commands +* @first: index of first execlist port to start coalescing from
s/coalescing/submitting
-Michał
Quoted 100 lines
drivers/gpu/drm/i915/i915_guc_submission.c +17
-13* * The only error here arises if the doorbell hardware isn't functioning * as expected, which really shouldn't happen. */ -static void i915_guc_submit (struct intel_engine_cs *engine) +static void i915_guc_submit (struct intel_engine_cs *engine, +const unsigned int first) {struct drm_i915_private *dev_priv = engine->i915;struct intel_guc *guc = &dev_priv->guc;@@ -498,7 +500,7 @@ static void i915_guc_submit(struct intel_engine_cs *engine)const unsigned int engine_id = engine->id;unsigned int n; -for (n =0 ; n <execlist_active_ports (el); n++) { +for (n = first; n <execlist_active_ports (el); n++) {struct execlist_port *port;struct drm_i915_gem_request *rq;unsigned int count;@@ -506,21 +508,22 @@ static void i915_guc_submit(struct intel_engine_cs *engine) port =execlist_port_index (el, n); rq =port_unpack (port, &count); -if (rq && count ==0 ) { -port_set (port,port_pack (rq, ++count)); +GEM_BUG_ON (!rq); +GEM_BUG_ON (count); -if (i915_vma_is_map_and_fenceable (rq->ring->vma)) -POSTING_READ_FW (GUC_STATUS ); +port_set (port,port_pack (rq, ++count)); -spin_lock (&client->wq_lock); +if (i915_vma_is_map_and_fenceable (rq->ring->vma)) +POSTING_READ_FW (GUC_STATUS ); -guc_wq_item_append (client, rq); -guc_ring_doorbell (client); +spin_lock (&client->wq_lock); - client->submissions[engine_id] +=1 ; +guc_wq_item_append (client, rq); +guc_ring_doorbell (client); -spin_unlock (&client->wq_lock); - } + client->submissions[engine_id] +=1 ; + +spin_unlock (&client->wq_lock); } }@@ -566,6 +569,7 @@ static void i915_guc_dequeue(struct intel_engine_cs *engine)struct drm_i915_gem_request *last =NULL ;bool submit = false;struct rb_node *rb; +unsigned int first_idx;spin_lock_irq (&engine->timeline->lock); rb = el->first;@@ -575,6 +579,7 @@ static void i915_guc_dequeue(struct intel_engine_cs *engine) goto done; port =execlist_request_port (el); + first_idx =execlist_get_port_index (el, port); do { struct i915_priolist *p = rb_entry(rb, typeof(*p), node);@@ -614,7 +619,7 @@ static void i915_guc_dequeue(struct intel_engine_cs *engine) el->first = rb;if (submit) {port_assign (port, last); -i915_guc_submit (engine); +i915_guc_submit (engine, first_idx); }spin_unlock_irq (&engine->timeline->lock); }drivers/gpu/drm/i915/intel_ringbuffer.h +9
-0@@ -556,6 +556,15 @@ execlist_port_index(struct intel_engine_execlist * const el,return &el->port[__port_idx (el->port_head, n, el->port_mask)]; } +static inline unsigned int +execlist_get_port_index (const struct intel_engine_execlist *const el, +const struct execlist_port *const port) +{ +const unsigned int n =port_index (port, el); + +return __port_idx (n, -el->port_head, el->port_mask); +} +static inline struct execlist_port *execlist_port_head (struct intel_engine_execlist *const el) {Signature · 1 line
2.11.0
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Patchwork
CI✓ Fi.CI.BAT: success for Support for more than two execlist ports (rev2)
In reply to Mika Kuoppala== Series Details ==
== Series Details ==
Series: Support for more than two execlist ports (rev2)
URL : https://patchwork.freedesktop.org/series/30183/
State : success
== Summary ==
Series 30183v2 Support for more than two execlist ports
https://patchwork.freedesktop.org/api/1.0/series/30183/revisions/2/mbox/
Test gem_exec_suspend:
Subgroup basic-s3:
incomplete -> PASS (fi-kbl-7500u) fdo#102850
Test kms_cursor_legacy:
Subgroup basic-busy-flip-before-cursor-legacy:
fail -> PASS (fi-snb-2600) fdo#100215
Test kms_force_connector_basic:
Subgroup force-connector-state:
skip -> PASS (fi-ivb-3520m)
Subgroup force-edid:
skip -> PASS (fi-ivb-3520m)
Subgroup force-load-detect:
skip -> PASS (fi-ivb-3520m)
Subgroup prune-stale-modes:
skip -> PASS (fi-ivb-3520m)
Test pm_rpm:
Subgroup basic-rte:
dmesg-warn -> PASS (fi-cfl-s) fdo#102294
Test drv_module_reload:
Subgroup basic-reload:
pass -> DMESG-WARN (fi-glk-1) fdo#102777fdo#102850 https://bugs.freedesktop.org/show_bug.cgi?id=102850
fdo#100215 https://bugs.freedesktop.org/show_bug.cgi?id=100215
fdo#102294 https://bugs.freedesktop.org/show_bug.cgi?id=102294
fdo#102777 https://bugs.freedesktop.org/show_bug.cgi?id=102777
fi-bdw-5557u total:289 pass:268 dwarn:0 dfail:0 fail:0 skip:21 time:444s fi-bdw-gvtdvm total:289 pass:265 dwarn:0 dfail:0 fail:0 skip:24 time:468s fi-blb-e6850 total:289 pass:224 dwarn:1 dfail:0 fail:0 skip:64 time:427s fi-bsw-n3050 total:289 pass:243 dwarn:0 dfail:0 fail:0 skip:46 time:531s fi-bwr-2160 total:289 pass:184 dwarn:0 dfail:0 fail:0 skip:105 time:277s fi-bxt-j4205 total:289 pass:260 dwarn:0 dfail:0 fail:0 skip:29 time:498s fi-byt-j1900 total:289 pass:254 dwarn:1 dfail:0 fail:0 skip:34 time:495s fi-byt-n2820 total:289 pass:250 dwarn:1 dfail:0 fail:0 skip:38 time:492s fi-cfl-s total:289 pass:223 dwarn:34 dfail:0 fail:0 skip:32 time:540s fi-elk-e7500 total:289 pass:230 dwarn:0 dfail:0 fail:0 skip:59 time:425s fi-glk-1 total:289 pass:259 dwarn:1 dfail:0 fail:0 skip:29 time:566s fi-hsw-4770 total:289 pass:263 dwarn:0 dfail:0 fail:0 skip:26 time:425s fi-hsw-4770r total:289 pass:263 dwarn:0 dfail:0 fail:0 skip:26 time:407s fi-ilk-650 total:289 pass:229 dwarn:0 dfail:0 fail:0 skip:60 time:433s fi-ivb-3520m total:289 pass:261 dwarn:0 dfail:0 fail:0 skip:28 time:477s fi-ivb-3770 total:289 pass:261 dwarn:0 dfail:0 fail:0 skip:28 time:461s fi-kbl-7500u total:289 pass:264 dwarn:1 dfail:0 fail:0 skip:24 time:473s fi-kbl-7560u total:289 pass:270 dwarn:0 dfail:0 fail:0 skip:19 time:576s fi-kbl-r total:289 pass:262 dwarn:0 dfail:0 fail:0 skip:27 time:588s fi-pnv-d510 total:289 pass:223 dwarn:1 dfail:0 fail:0 skip:65 time:542s fi-skl-6260u total:289 pass:269 dwarn:0 dfail:0 fail:0 skip:20 time:446s fi-skl-6700k total:289 pass:265 dwarn:0 dfail:0 fail:0 skip:24 time:749s fi-skl-6770hq total:289 pass:269 dwarn:0 dfail:0 fail:0 skip:20 time:490s fi-skl-gvtdvm total:289 pass:266 dwarn:0 dfail:0 fail:0 skip:23 time:476s fi-snb-2520m total:289 pass:251 dwarn:0 dfail:0 fail:0 skip:38 time:560s fi-snb-2600 total:289 pass:250 dwarn:0 dfail:0 fail:0 skip:39 time:413s
ed7a99bf23cea2276e77ba26d219e58e069d1e32 drm-tip: 2017y-09m-20d-11h-03m-37s UTC integration manifest 03b7a2df3fd1 drm/i915: Improve GuC request coalescing582ba31b7a9f drm/i915: Keep track of reserved execlist ports02b6dae25461 drm/i915: Introduce execlist_port_* accessors202cc6c2b792 drm/i915: Make execlist port count variable3853e558bdd7 drm/i915: Add execlist_port_complete9dd456d33cc9 drm/i915: Wrap port cancellation into a function830307905e9c drm/i915: Move execlist initialization into intel_engine_cs.c 791be2cd0de1 drm/i915: Make own struct for execlist items
== Logs ==
For more details see: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_5766/
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Patchwork
CI✓ Fi.CI.IGT: success for Support for more than two execlist ports (rev2)
In reply to Mika Kuoppala== Series Details ==
== Series Details ==
Series: Support for more than two execlist ports (rev2)
URL : https://patchwork.freedesktop.org/series/30183/
State : success
== Summary ==
Test perf:
Subgroup blocking:
pass -> FAIL (shard-hsw) fdo#102252 +1fdo#102252 https://bugs.freedesktop.org/show_bug.cgi?id=102252
shard-hsw total:2317 pass:1245 dwarn:2 dfail:0 fail:13 skip:1057 time:9584s
== Logs ==
For more details see: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_5766/shards.html
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx