Commit 4f44afe8 authored by Chris Wilson's avatar Chris Wilson

drm/i915/selftests: Flush the submission, not cancel it!

Use intel_engine_flush_submission() when we want to ensure that the
tasklet is run. tasklet_kill(), while it may ensure that an ongoing
tasklet is completed, also prevents the tasklet from running if it's
already scheduled and hasn't yet been run.

Closes: https://gitlab.freedesktop.org/drm/intel/-/issues/1874Signed-off-by: default avatarChris Wilson <chris@chris-wilson.co.uk>
Reviewed-by: default avatarTvrtko Ursulin <tvrtko.ursulin@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20200521124304.3157692-1-chris@chris-wilson.co.uk
parent 1a539247
...@@ -332,7 +332,7 @@ static int live_unlite_restore(struct intel_gt *gt, int prio) ...@@ -332,7 +332,7 @@ static int live_unlite_restore(struct intel_gt *gt, int prio)
i915_request_put(rq[0]); i915_request_put(rq[0]);
err_ce: err_ce:
tasklet_kill(&engine->execlists.tasklet); /* flush submission */ intel_engine_flush_submission(engine);
igt_spinner_end(&spin); igt_spinner_end(&spin);
for (n = 0; n < ARRAY_SIZE(ce); n++) { for (n = 0; n < ARRAY_SIZE(ce); n++) {
if (IS_ERR_OR_NULL(ce[n])) if (IS_ERR_OR_NULL(ce[n]))
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment