drm/i915/gt: use new tasklet API for execution list
Subsystems (2)
PATCH v2 1/1 drm/i915/gt: use new tasklet API for execution list
This converts the driver to use the new tasklet API introduced in commit 12cc923f1ccc ("tasklet: Introduce new initialization API")
---
v2: Rebased on drm-intel-next
Tested on my Dell XPS 13 9300.
--- drivers/gpu/drm/i915/gt/intel_engine_cs.c | 4 +-- .../drm/i915/gt/intel_execlists_submission.c | 25 ++++++++----------- .../gpu/drm/i915/gt/uc/intel_guc_submission.c | 9 +++---- 3 files changed, 17 insertions(+), 21 deletions(-)
drivers/gpu/drm/i915/gt/intel_engine_cs.c +2 -2
@@ -1234,14 +1234,14 @@ void __intel_engine_flush_submission(struct intel_engine_cs *engine, bool sync) {struct tasklet_struct *t = &engine->execlists.tasklet; -if (!t->func) +if (!t->callback)return ;local_bh_disable ();if (tasklet_trylock (t)) {/* Must wait for any GPU reset in progress. */ if (__tasklet_is_enabled (t)) - t->func (t->data); + t->callback (t);tasklet_unlock (t); }local_bh_enable ();
drivers/gpu/drm/i915/gt/intel_execlists_submission.c +11 -14
@@ -2376,9 +2376,9 @@ static bool preempt_timeout(const struct intel_engine_cs *const engine)* Check the unread Context Status Buffers and manage the submission of new * contexts to the ELSP accordingly. */ -static void execlists_submission_tasklet (unsigned long data) +static void execlists_submission_tasklet (struct tasklet_struct *t) { -struct intel_engine_cs *const engine = (struct intel_engine_cs *)data; +struct intel_engine_cs *const engine =from_tasklet (engine, t, execlists.tasklet);struct i915_request *post[2 *EXECLIST_MAX_PORTS ];struct i915_request **inactive;
@@ -2956,9 +2956,9 @@ static void execlists_reset_rewind(struct intel_engine_cs *engine, bool stalled)rcu_read_unlock (); } -static void nop_submission_tasklet (unsigned long data) +static void nop_submission_tasklet (struct tasklet_struct *t) { -struct intel_engine_cs *const engine = (struct intel_engine_cs *)data; +struct intel_engine_cs *const engine =from_tasklet (engine, t, execlists.tasklet);/* The driver is wedged; don't process any more events. */ WRITE_ONCE (engine->execlists.queue_priority_hint,INT_MIN );
@@ -3043,7 +3043,7 @@ static void execlists_reset_cancel(struct intel_engine_cs *engine) execlists->queue =RB_ROOT_CACHED ;GEM_BUG_ON (__tasklet_is_enabled (&execlists->tasklet)); - execlists->tasklet.func = nop_submission_tasklet; + execlists->tasklet.callback = nop_submission_tasklet;spin_unlock_irqrestore (&engine->active.lock, flags);rcu_read_unlock ();
@@ -3104,7 +3104,7 @@ static void execlists_set_default_submission(struct intel_engine_cs *engine) { engine->submit_request = execlists_submit_request; engine->schedule = i915_schedule; - engine->execlists.tasklet.func = execlists_submission_tasklet; + engine->execlists.tasklet.callback = execlists_submission_tasklet; engine->reset.prepare = execlists_reset_prepare; engine->reset.rewind = execlists_reset_rewind;
@@ -3228,8 +3228,7 @@ int intel_execlists_submission_setup(struct intel_engine_cs *engine)struct intel_uncore *uncore = engine->uncore;u32 base = engine->mmio_base; -tasklet_init (&engine->execlists.tasklet, - execlists_submission_tasklet, (unsigned long )engine); +tasklet_setup (&engine->execlists.tasklet, execlists_submission_tasklet);timer_setup (&engine->execlists.timer, execlists_timeslice,0 );timer_setup (&engine->execlists.preempt, execlists_preempt,0 );
@@ -3471,9 +3470,9 @@ static intel_engine_mask_t virtual_submission_mask(struct virtual_engine *ve)return mask; } -static void virtual_submission_tasklet (unsigned long data) +static void virtual_submission_tasklet (struct tasklet_struct *t) { -struct virtual_engine *const ve = (struct virtual_engine *)data; +struct virtual_engine *const ve =from_tasklet (ve, t, base.execlists.tasklet);const int prio =READ_ONCE (ve->base.execlists.queue_priority_hint);intel_engine_mask_t mask;unsigned int n;
@@ -3683,9 +3682,7 @@ intel_execlists_create_virtual(struct intel_engine_cs **siblings,INIT_LIST_HEAD (virtual_queue (ve)); ve->base.execlists.queue_priority_hint =INT_MIN ; -tasklet_init (&ve->base.execlists.tasklet, - virtual_submission_tasklet, - (unsigned long )ve); +tasklet_setup (&ve->base.execlists.tasklet, virtual_submission_tasklet);intel_context_init (&ve->context, &ve->base);
@@ -3713,7 +3710,7 @@ intel_execlists_create_virtual(struct intel_engine_cs **siblings,* layering if we handle cloning of the requests and * submitting a copy into each backend. */ -if (sibling->execlists.tasklet.func != +if (sibling->execlists.tasklet.callback != execlists_submission_tasklet) { err = -ENODEV ; goto err_put;
drivers/gpu/drm/i915/gt/uc/intel_guc_submission.c +4 -5
@@ -238,9 +238,9 @@ static void __guc_dequeue(struct intel_engine_cs *engine) execlists->active = execlists->inflight; } -static void guc_submission_tasklet (unsigned long data) +static void guc_submission_tasklet (struct tasklet_struct *t) { -struct intel_engine_cs *const engine = (struct intel_engine_cs *)data; +struct intel_engine_cs *const engine =from_tasklet (engine, t, execlists.tasklet);struct intel_engine_execlists *const execlists = &engine->execlists;struct i915_request **port, *rq;unsigned long flags;
@@ -610,7 +610,7 @@ static void guc_set_default_submission(struct intel_engine_cs *engine) { engine->submit_request = guc_submit_request; engine->schedule = i915_schedule; - engine->execlists.tasklet.func = guc_submission_tasklet; + engine->execlists.tasklet.callback = guc_submission_tasklet; engine->reset.prepare = guc_reset_prepare; engine->reset.rewind = guc_reset_rewind;
@@ -702,8 +702,7 @@ int intel_guc_submission_setup(struct intel_engine_cs *engine)*/ GEM_BUG_ON (INTEL_GEN (i915) <11 ); -tasklet_init (&engine->execlists.tasklet, - guc_submission_tasklet, (unsigned long )engine); +tasklet_setup (&engine->execlists.tasklet, guc_submission_tasklet);guc_default_vfuncs (engine);guc_default_irqs (engine);
Signature · 6 lines
2.30.0 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Quoting Emil Renner Berthing (2021-01-26 15:01:55)
Quoted 7 lines
This converts the driver to use the new tasklet API introduced in commit
12cc923f1ccc("tasklet: Introduce new initialization API")Signed-off-by Emil Renner Berthing <[email protected]>---
v2: Rebased on drm-intel-next
Ta. Saves me having to do the fixup.
Will be applied to drm-intel-gt-next which is scheduled for inclusion in 5.13. It should apply against the 5.12 merge window if there's a tree through which you want to migrate the tasklet API faster. -Chris
_______________________________________________
dri-devel mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/dri-devel
Quoted 9 lines · Chris Wilson
Quoting Emil Renner Berthing (2021-01-26 15:01:55)
Quoted 7 lines
This converts the driver to use the new tasklet API introduced in commit
12cc923f1ccc("tasklet: Introduce new initialization API")Signed-off-by Emil Renner Berthing <[email protected]>---
v2: Rebased on drm-intel-next
Quoted 7 lines
Ta. Saves me having to do the fixup.
Reviewed-by Chris Wilson <[email protected]>Will be applied to drm-intel-gt-next which is scheduled for inclusion in 5.13. It should apply against the 5.12 merge window if there's a tree through which you want to migrate the tasklet API faster.
That's fine by me, thanks!
/Emil
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Patchwork
CI[Intel-gfx] ✗ Fi.CI.BAT: failure for drm/i915/gt: use new tasklet API for execution list (rev2)
In reply to Emil Renner Berthing== Series Details ==
== Series Details ==
Series: drm/i915/gt: use new tasklet API for execution list (rev2)
URL : https://patchwork.freedesktop.org/series/86253/
State : failure
== Summary ==
CI Bug Log - changes from CI_DRM_9684 -> Patchwork_19504
====================================================
Summary
-------
**FAILURE**
Serious unknown changes coming with Patchwork_19504 absolutely need to be verified manually.
If you think the reported changes have nothing to do with the changes introduced in Patchwork_19504, please notify your bug team to allow them to document this new failure mode, which will reduce false positives in CI.
External URL: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_19504/index.html
Possible new issues
-------------------
Here are the unknown changes that may have been introduced in Patchwork_19504:
### IGT changes ###
#### Possible regressions ####
* igt@i915_selftest@live@execlists:
- fi-cfl-8109u: [PASS][1] -> [INCOMPLETE][2]
[1]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_9684/fi-cfl-8109u/igt@i915_selftest@[email protected]
[2]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_19504/fi-cfl-8109u/igt@i915_selftest@[email protected]
- fi-bsw-nick: [PASS][3] -> [INCOMPLETE][4]
[3]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_9684/fi-bsw-nick/igt@i915_selftest@[email protected]
[4]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_19504/fi-bsw-nick/igt@i915_selftest@[email protected]
- fi-glk-dsi: [PASS][5] -> [INCOMPLETE][6]
[5]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_9684/fi-glk-dsi/igt@i915_selftest@[email protected]
[6]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_19504/fi-glk-dsi/igt@i915_selftest@[email protected]
- fi-cfl-8700k: [PASS][7] -> [INCOMPLETE][8]
[7]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_9684/fi-cfl-8700k/igt@i915_selftest@[email protected]
[8]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_19504/fi-cfl-8700k/igt@i915_selftest@[email protected]
- fi-bsw-kefka: [PASS][9] -> [INCOMPLETE][10]
[9]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_9684/fi-bsw-kefka/igt@i915_selftest@[email protected]
[10]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_19504/fi-bsw-kefka/igt@i915_selftest@[email protected]
- fi-bsw-n3050: [PASS][11] -> [INCOMPLETE][12]
[11]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_9684/fi-bsw-n3050/igt@i915_selftest@[email protected]
[12]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_19504/fi-bsw-n3050/igt@i915_selftest@[email protected]
- fi-cml-s: [PASS][13] -> [INCOMPLETE][14]
[13]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_9684/fi-cml-s/igt@i915_selftest@[email protected]
[14]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_19504/fi-cml-s/igt@i915_selftest@[email protected]
- fi-cfl-guc: [PASS][15] -> [INCOMPLETE][16]
[15]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_9684/fi-cfl-guc/igt@i915_selftest@[email protected]
[16]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_19504/fi-cfl-guc/igt@i915_selftest@[email protected]
- fi-bxt-dsi: [PASS][17] -> [INCOMPLETE][18]
[17]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_9684/fi-bxt-dsi/igt@i915_selftest@[email protected]
[18]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_19504/fi-bxt-dsi/igt@i915_selftest@[email protected]
- fi-cml-u2: [PASS][19] -> [INCOMPLETE][20]
[19]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_9684/fi-cml-u2/igt@i915_selftest@[email protected]
[20]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_19504/fi-cml-u2/igt@i915_selftest@[email protected]
- fi-bdw-5557u: [PASS][21] -> [INCOMPLETE][22]
[21]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_9684/fi-bdw-5557u/igt@i915_selftest@[email protected]
[22]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_19504/fi-bdw-5557u/igt@i915_selftest@[email protected]
#### Suppressed ####
The following results come from untrusted machines, tests, or statuses. They do not affect the overall result.
* igt@i915_selftest@live@execlists:
- {fi-rkl-11500t}: [PASS][23] -> [INCOMPLETE][24]
[23]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_9684/fi-rkl-11500t/igt@i915_selftest@[email protected]
[24]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_19504/fi-rkl-11500t/igt@i915_selftest@[email protected]
- {fi-ehl-1}: [PASS][25] -> [INCOMPLETE][26]
[25]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_9684/fi-ehl-1/igt@i915_selftest@[email protected]
[26]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_19504/fi-ehl-1/igt@i915_selftest@[email protected]
Known issues
------------
Here are the changes found in Patchwork_19504 that come from known issues:
### IGT changes ###
#### Issues hit ####
* igt@gem_flink_basic@bad-flink:
- fi-tgl-y: [PASS][27] -> [DMESG-WARN][28] ([i915#402]) +1 similar issue
[27]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_9684/fi-tgl-y/igt@[email protected]
[28]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_19504/fi-tgl-y/igt@[email protected]
* igt@i915_selftest@live@execlists:
- fi-kbl-r: [PASS][29] -> [INCOMPLETE][30] ([i915#794])
[29]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_9684/fi-kbl-r/igt@i915_selftest@[email protected]
[30]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_19504/fi-kbl-r/igt@i915_selftest@[email protected]
- fi-kbl-x1275: [PASS][31] -> [INCOMPLETE][32] ([i915#794])
[31]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_9684/fi-kbl-x1275/igt@i915_selftest@[email protected]
[32]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_19504/fi-kbl-x1275/igt@i915_selftest@[email protected]
- fi-icl-u2: [PASS][33] -> [INCOMPLETE][34] ([i915#2276])
[33]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_9684/fi-icl-u2/igt@i915_selftest@[email protected]
[34]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_19504/fi-icl-u2/igt@i915_selftest@[email protected]
- fi-skl-6600u: [PASS][35] -> [INCOMPLETE][36] ([CI#80])
[35]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_9684/fi-skl-6600u/igt@i915_selftest@[email protected]
[36]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_19504/fi-skl-6600u/igt@i915_selftest@[email protected]
- fi-tgl-y: [PASS][37] -> [INCOMPLETE][38] ([i915#2268])
[37]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_9684/fi-tgl-y/igt@i915_selftest@[email protected]
[38]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_19504/fi-tgl-y/igt@i915_selftest@[email protected]
- fi-tgl-u2: [PASS][39] -> [INCOMPLETE][40] ([i915#2268])
[39]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_9684/fi-tgl-u2/igt@i915_selftest@[email protected]
[40]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_19504/fi-tgl-u2/igt@i915_selftest@[email protected]
- fi-skl-guc: [PASS][41] -> [INCOMPLETE][42] ([CI#80])
[41]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_9684/fi-skl-guc/igt@i915_selftest@[email protected]
[42]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_19504/fi-skl-guc/igt@i915_selftest@[email protected]
- fi-skl-6700k2: [PASS][43] -> [INCOMPLETE][44] ([CI#80])
[43]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_9684/fi-skl-6700k2/igt@i915_selftest@[email protected]
[44]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_19504/fi-skl-6700k2/igt@i915_selftest@[email protected]
- fi-icl-y: [PASS][45] -> [INCOMPLETE][46] ([i915#2276])
[45]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_9684/fi-icl-y/igt@i915_selftest@[email protected]
[46]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_19504/fi-icl-y/igt@i915_selftest@[email protected]
- fi-kbl-soraka: [PASS][47] -> [INCOMPLETE][48] ([i915#794])
[47]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_9684/fi-kbl-soraka/igt@i915_selftest@[email protected]
[48]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_19504/fi-kbl-soraka/igt@i915_selftest@[email protected]
- fi-kbl-guc: [PASS][49] -> [INCOMPLETE][50] ([i915#794])
[49]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_9684/fi-kbl-guc/igt@i915_selftest@[email protected]
[50]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_19504/fi-kbl-guc/igt@i915_selftest@[email protected]
- fi-kbl-7500u: [PASS][51] -> [INCOMPLETE][52] ([i915#794])
[51]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_9684/fi-kbl-7500u/igt@i915_selftest@[email protected]
[52]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_19504/fi-kbl-7500u/igt@i915_selftest@[email protected]
* igt@kms_chamelium@common-hpd-after-suspend:
- fi-kbl-7500u: [PASS][53] -> [DMESG-FAIL][54] ([i915#165])
[53]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_9684/fi-kbl-7500u/igt@[email protected]
[54]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_19504/fi-kbl-7500u/igt@[email protected]
* igt@kms_chamelium@dp-crc-fast:
- fi-icl-u2: [PASS][55] -> [FAIL][56] ([i915#1161] / [i915#262])
[55]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_9684/fi-icl-u2/igt@[email protected]
[56]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_19504/fi-icl-u2/igt@[email protected]
#### Possible fixes ####
* igt@debugfs_test@read_all_entries:
- fi-tgl-y: [DMESG-WARN][57] ([i915#402]) -> [PASS][58] +1 similar issue
[57]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_9684/fi-tgl-y/igt@debugfs_test@read_all_entries.html
[58]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_19504/fi-tgl-y/igt@debugfs_test@read_all_entries.html
* igt@i915_module_load@reload:
- fi-kbl-7500u: [DMESG-WARN][59] ([i915#2605]) -> [PASS][60]
[59]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_9684/fi-kbl-7500u/igt@[email protected]
[60]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_19504/fi-kbl-7500u/igt@[email protected]
{name}: This element is suppressed. This means it is ignored when computing
the status of the difference (SUCCESS, WARNING, or FAILURE).
[CI#80]: https://gitlab.freedesktop.org/gfx-ci/i915-infra/issues/80
[fdo#109271]: https://bugs.freedesktop.org/show_bug.cgi?id=109271
[fdo#109285]: https://bugs.freedesktop.org/show_bug.cgi?id=109285
[i915#1161]: https://gitlab.freedesktop.org/drm/intel/issues/1161
[i915#165]: https://gitlab.freedesktop.org/drm/intel/issues/165
[i915#2268]: https://gitlab.freedesktop.org/drm/intel/issues/2268
[i915#2276]: https://gitlab.freedesktop.org/drm/intel/issues/2276
[i915#2582]: https://gitlab.freedesktop.org/drm/intel/issues/2582
[i915#2605]: https://gitlab.freedesktop.org/drm/intel/issues/2605
[i915#262]: https://gitlab.freedesktop.org/drm/intel/issues/262
[i915#3004]: https://gitlab.freedesktop.org/drm/intel/issues/3004
[i915#3005]: https://gitlab.freedesktop.org/drm/intel/issues/3005
[i915#402]: https://gitlab.freedesktop.org/drm/intel/issues/402
[i915#794]: https://gitlab.freedesktop.org/drm/intel/issues/794
Participating hosts (44 -> 39)
------------------------------
Missing (5): fi-jsl-1 fi-ilk-m540 fi-hsw-4200u fi-bsw-cyan fi-ctg-p8600
Build changes
-------------
* Linux: CI_DRM_9684 -> Patchwork_19504
CI-20190529: 20190529
CI_DRM_9684: 53a183b40b798192f7211b05d550c8145d1397b5 @ git://anongit.freedesktop.org/gfx-ci/linux
IGT_5972: 82fa6021821edb5d9609f4cce213920e0936d6f3 @ git://anongit.freedesktop.org/xorg/app/intel-gpu-tools
Patchwork_19504: d2e20936921a5568bbf86901b252bbef79a16c24 @ git://anongit.freedesktop.org/gfx-ci/linux
== Linux commits ==
d2e20936921a drm/i915/gt: use new tasklet API for execution list
== Logs ==
For more details see: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_19504/index.html
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx