drm/i915/gt: use new tasklet API for execution list
Subsystems (2)
PATCH 1/1 drm/i915/gt: use new tasklet API for execution list
From: Emil Renner Berthing <[email protected]>
This converts the driver to use the new tasklet API introduced in commit 12cc923f1ccc ("tasklet: Introduce new initialization API")
---
Tested on my Dell XPS 13 9300.
drivers/gpu/drm/i915/gt/intel_engine_cs.c | 4 +-- drivers/gpu/drm/i915/gt/intel_lrc.c | 27 +++++++++---------- drivers/gpu/drm/i915/gt/selftest_lrc.c | 4 +-- .../gpu/drm/i915/gt/uc/intel_guc_submission.c | 6 ++--- 4 files changed, 19 insertions(+), 22 deletions(-)
drivers/gpu/drm/i915/gt/intel_engine_cs.c +2 -2
@@ -1193,7 +1193,7 @@ void intel_engine_flush_submission(struct intel_engine_cs *engine) {struct tasklet_struct *t = &engine->execlists.tasklet; -if (!t->func) +if (!t->callback)return ;/* Synchronise and wait for the tasklet on another CPU */
@@ -1204,7 +1204,7 @@ void intel_engine_flush_submission(struct intel_engine_cs *engine)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_lrc.c +12 -15
@@ -3194,9 +3194,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);bool timeout =preempt_timeout (engine);process_csb (engine);
@@ -4401,9 +4401,9 @@ static void execlists_reset_rewind(struct intel_engine_cs *engine, bool stalled)spin_unlock_irqrestore (&engine->active.lock, flags); } -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 );
@@ -4487,7 +4487,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); }
@@ -4503,7 +4503,7 @@ static void execlists_reset_finish(struct intel_engine_cs *engine)*/ GEM_BUG_ON (!reset_in_progress (execlists));if (!RB_EMPTY_ROOT (&execlists->queue.rb_root)) - execlists->tasklet.func (execlists->tasklet.data); + execlists->tasklet.callback (&execlists->tasklet);if (__tasklet_enable (&execlists->tasklet))/* And kick in case we missed a new request submission. */
@@ -5093,7 +5093,7 @@ void intel_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;
@@ -5220,8 +5220,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 );
@@ -5670,9 +5669,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;
@@ -5883,9 +5882,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);
@@ -5913,7 +5910,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/selftest_lrc.c +2 -2
@@ -631,7 +631,7 @@ static int live_hold_reset(void *arg) }tasklet_disable (&engine->execlists.tasklet); - engine->execlists.tasklet.func (engine->execlists.tasklet.data); + engine->execlists.tasklet.callback (&engine->execlists.tasklet);GEM_BUG_ON (execlists_active (&engine->execlists) != rq);i915_request_get (rq);
@@ -4577,7 +4577,7 @@ static int reset_virtual_engine(struct intel_gt *gt, }tasklet_disable (&engine->execlists.tasklet); - engine->execlists.tasklet.func (engine->execlists.tasklet.data); + engine->execlists.tasklet.callback (&engine->execlists.tasklet);GEM_BUG_ON (execlists_active (&engine->execlists) != rq);/* Fake a preemption event; failed of course */
drivers/gpu/drm/i915/gt/uc/intel_guc_submission.c +3 -3
@@ -344,9 +344,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;
@@ -591,7 +591,7 @@ static void guc_set_default_submission(struct intel_engine_cs *engine)*/ intel_execlists_set_default_submission (engine); - engine->execlists.tasklet.func = guc_submission_tasklet; + engine->execlists.tasklet.callback = guc_submission_tasklet;/* do not use execlists park/unpark */ engine->park = engine->unpark =NULL ;
Signature · 1 line
2.30.0
Patchwork
CI[Intel-gfx] ✗ Fi.CI.BUILD: failure for drm/i915/gt: use new tasklet API for execution list
== Series Details ==
== Series Details ==
Series: drm/i915/gt: use new tasklet API for execution list
URL : https://patchwork.freedesktop.org/series/86253/
State : failure
== Summary ==
Applying: drm/i915/gt: use new tasklet API for execution list
Using index info to reconstruct a base tree...
M drivers/gpu/drm/i915/gt/intel_engine_cs.c
M drivers/gpu/drm/i915/gt/intel_lrc.c
M drivers/gpu/drm/i915/gt/selftest_lrc.c
M drivers/gpu/drm/i915/gt/uc/intel_guc_submission.c
Falling back to patching base and 3-way merge...
Auto-merging drivers/gpu/drm/i915/gt/uc/intel_guc_submission.c
CONFLICT (content): Merge conflict in drivers/gpu/drm/i915/gt/uc/intel_guc_submission.c Auto-merging drivers/gpu/drm/i915/gt/selftest_lrc.c
CONFLICT (content): Merge conflict in drivers/gpu/drm/i915/gt/selftest_lrc.c Auto-merging drivers/gpu/drm/i915/gt/intel_lrc.c
CONFLICT (content): Merge conflict in drivers/gpu/drm/i915/gt/intel_lrc.c Auto-merging drivers/gpu/drm/i915/gt/intel_engine_cs.c
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch Patch failed at 0001 drm/i915/gt: use new tasklet API for execution list When you have resolved this problem, run "git am --continue".
If you prefer to skip this patch, run "git am --skip" instead.
To restore the original branch and stop patching, run "git am --abort".
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx