drm/i915: Make own struct for execlist items
Subsystems (2)
PATCH 1/1 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.
--- drivers/gpu/drm/i915/i915_debugfs.c | 6 +-- drivers/gpu/drm/i915/i915_gem.c | 16 ++++---- drivers/gpu/drm/i915/i915_gpu_error.c | 4 +- drivers/gpu/drm/i915/i915_guc_submission.c | 19 ++++----- drivers/gpu/drm/i915/i915_irq.c | 5 ++- drivers/gpu/drm/i915/intel_engine_cs.c | 12 +++--- drivers/gpu/drm/i915/intel_lrc.c | 64 +++++++++++++++--------------- drivers/gpu/drm/i915/intel_ringbuffer.h | 45 ++++++++++++--------- 8 files changed, 91 insertions(+), 80 deletions(-)
drivers/gpu/drm/i915/i915_debugfs.c +3 -3
@@ -3341,10 +3341,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, ",
@@ -3358,7 +3358,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 +8 -8
@@ -2810,8 +2810,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);
@@ -2990,7 +2990,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); }
@@ -3042,17 +3042,17 @@ static void engine_set_wedged(struct intel_engine_cs *engine)*/ if (i915.enable_execlists) { -struct execlist_port *port = engine->execlist_port; +struct execlist_port *port = engine->execlist.port;unsigned long flags;unsigned int n;spin_lock_irqsave (&engine->timeline->lock, flags); -for (n =0 ; n <ARRAY_SIZE (engine->execlist_port); n++) +for (n =0 ; n <ARRAY_SIZE (engine->execlist.port); n++)i915_gem_request_put (port_request (&port[n])); -memset (engine->execlist_port,0 ,sizeof (engine->execlist_port)); - engine->execlist_queue =RB_ROOT ; - engine->execlist_first =NULL ; +memset (engine->execlist.port,0 ,sizeof (engine->execlist.port)); + engine->execlist.queue =RB_ROOT ; + engine->execlist.first =NULL ;spin_unlock_irqrestore (&engine->timeline->lock, flags);
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 +10 -9
@@ -661,21 +661,22 @@ static void port_assign(struct execlist_port *port,static bool 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 =port_request (port);struct rb_node *rb;bool submit = false;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;
@@ -696,13 +697,13 @@ static bool 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);spin_unlock_irq (&engine->timeline->lock);
@@ -712,8 +713,8 @@ static bool 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;bool submit;
@@ -1256,7 +1257,7 @@ int i915_guc_submission_enable(struct drm_i915_private *dev_priv)* take over the callback without changing any other state * in the tasklet. */ - engine->irq_tasklet.func = i915_guc_irq_handler; + engine->execlist.irq_tasklet.func = i915_guc_irq_handler;clear_bit (ENGINE_IRQ_EXECLIST , &engine->irq_posted);/* Replay the current set of previously submitted requests */
drivers/gpu/drm/i915/i915_irq.c +3 -2
@@ -1308,10 +1308,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; }
@@ -1323,7 +1324,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);
@@ -1305,11 +1305,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? */
@@ -1358,8 +1358,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 +33 -31
217 lines not on this page · raw message
drivers/gpu/drm/i915/intel_ringbuffer.h +26 -19
57 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
Patchwork
CI✓ Fi.CI.BAT: success for drm/i915: Make own struct for execlist items
== Series Details ==
== Series Details ==
Series: drm/i915: Make own struct for execlist items
URL : https://patchwork.freedesktop.org/series/29129/
State : success
== Summary ==
Series 29129v1 drm/i915: Make own struct for execlist items
https://patchwork.freedesktop.org/api/1.0/series/29129/revisions/1/mbox/
Test gem_exec_flush:
Subgroup basic-batch-kernel-default-uc:
pass -> FAIL (fi-snb-2600) fdo#100007
Test kms_pipe_crc_basic:
Subgroup suspend-read-crc-pipe-b:
pass -> DMESG-WARN (fi-byt-n2820) fdo#101705fdo#100007 https://bugs.freedesktop.org/show_bug.cgi?id=100007
fdo#101705 https://bugs.freedesktop.org/show_bug.cgi?id=101705
fi-bdw-5557u total:279 pass:268 dwarn:0 dfail:0 fail:0 skip:11 time:459s fi-bdw-gvtdvm total:279 pass:265 dwarn:0 dfail:0 fail:0 skip:14 time:440s fi-blb-e6850 total:279 pass:224 dwarn:1 dfail:0 fail:0 skip:54 time:369s fi-bsw-n3050 total:279 pass:243 dwarn:0 dfail:0 fail:0 skip:36 time:548s fi-bwr-2160 total:279 pass:184 dwarn:0 dfail:0 fail:0 skip:95 time:252s fi-bxt-j4205 total:279 pass:260 dwarn:0 dfail:0 fail:0 skip:19 time:525s fi-byt-j1900 total:279 pass:254 dwarn:1 dfail:0 fail:0 skip:24 time:527s fi-byt-n2820 total:279 pass:250 dwarn:1 dfail:0 fail:0 skip:28 time:525s fi-elk-e7500 total:279 pass:230 dwarn:0 dfail:0 fail:0 skip:49 time:432s fi-glk-2a total:279 pass:260 dwarn:0 dfail:0 fail:0 skip:19 time:615s fi-hsw-4770 total:279 pass:263 dwarn:0 dfail:0 fail:0 skip:16 time:447s fi-hsw-4770r total:279 pass:263 dwarn:0 dfail:0 fail:0 skip:16 time:421s fi-ilk-650 total:279 pass:229 dwarn:0 dfail:0 fail:0 skip:50 time:420s fi-ivb-3520m total:279 pass:261 dwarn:0 dfail:0 fail:0 skip:18 time:500s fi-ivb-3770 total:279 pass:261 dwarn:0 dfail:0 fail:0 skip:18 time:474s fi-kbl-7260u total:279 pass:268 dwarn:1 dfail:0 fail:0 skip:10 time:499s fi-kbl-7500u total:279 pass:261 dwarn:0 dfail:0 fail:0 skip:18 time:477s fi-kbl-7560u total:279 pass:269 dwarn:0 dfail:0 fail:0 skip:10 time:596s fi-kbl-r total:279 pass:261 dwarn:0 dfail:0 fail:0 skip:18 time:600s fi-pnv-d510 total:279 pass:223 dwarn:1 dfail:0 fail:0 skip:55 time:532s fi-skl-6260u total:279 pass:269 dwarn:0 dfail:0 fail:0 skip:10 time:474s fi-skl-6700k total:279 pass:261 dwarn:0 dfail:0 fail:0 skip:18 time:482s fi-skl-6770hq total:279 pass:269 dwarn:0 dfail:0 fail:0 skip:10 time:493s fi-skl-gvtdvm total:279 pass:266 dwarn:0 dfail:0 fail:0 skip:13 time:442s fi-skl-x1585l total:279 pass:268 dwarn:0 dfail:0 fail:0 skip:11 time:487s fi-snb-2520m total:279 pass:251 dwarn:0 dfail:0 fail:0 skip:28 time:544s fi-snb-2600 total:279 pass:249 dwarn:0 dfail:0 fail:1 skip:29 time:408s
dbfb2f62576e1c3550d10398b097589959356db3 drm-tip: 2017y-08m-21d-08h-13m-34s UTC integration manifest 6ee466a78790 drm/i915: Make own struct for execlist items
== Logs ==
For more details see: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_5457/
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Quoting Mika Kuoppala (2017-08-22 10:37:16)
Quoted 6 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.
Suggested-by Chris Wilson <[email protected]>Signed-off-by Mika Kuoppala <[email protected]>
Looks ok, I quibble about irq_tasklet, half thinking that we treat it more generically than just execlists; but really it only used for handling the context-switch interrupt.
-Chris
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Quoted 6 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.
Suggested-by Chris Wilson <[email protected]>Signed-off-by Mika Kuoppala <[email protected]>
<SNIP>
Quoted 15 lines
drivers/gpu/drm/i915/intel_ringbuffer.h +15
-0+/* Execlists */ +struct intel_engine_execlist { +struct tasklet_struct irq_tasklet; +struct i915_priolist default_priolist; +bool no_priolist; + +struct execlist_port { +struct drm_i915_gem_request *request_count; +#define EXECLIST_COUNT_BITS 2 +#define port_request (p) ptr_mask_bits((p)->request_count, EXECLIST_COUNT_BITS) +#define port_count (p) ptr_unmask_bits((p)->request_count, EXECLIST_COUNT_BITS) +#define port_pack (rq, count) ptr_pack_bits(rq, count, EXECLIST_COUNT_BITS) +#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)
drivers/gpu/drm/i915/intel_ringbuffer.h struct i915_priolist { · line 211
Quoted 10 lines
drivers/gpu/drm/i915/intel_ringbuffer.h +10
-0+#define port_index (p, e) ((p) - (e)->execlist.port) + GEM_DEBUG_DECL(u32 context_id); + } port[2 ]; + +struct rb_root queue; +struct rb_node *first; + +unsigned int fw_domains; +}; +
Please do add a small kerneldoc for each parameter while touching the code, anyway this is:
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