diff options
| author |   Chris Wilson <chris@chris-wilson.co.uk> | 2020-02-18 21:12:15 +0000 |
|---|---|---|
| committer | Chris Wilson <chris@chris-wilson.co.uk> | 2020-02-18 21:21:53 +0000 |
| commit | d30d3d5f58c4b328513204dfb7dd7ed1a125195f (patch) | |
| tree | c7eabbcafa3a6628bac73d47610776392658edb5 | |
| parent | drm/i915/gt: Fix up missing error propagation for heartbeat pulses (diff) | |
| download | wireguard-linux-d30d3d5f58c4b328513204dfb7dd7ed1a125195f.tar.xz wireguard-linux-d30d3d5f58c4b328513204dfb7dd7ed1a125195f.zip | |
drm/i915/selftests: Flush tasklet on wait_for_submit()
Always flush the tasklet if we have pending submissions in
wait_for_submit(), so that even if we see the HW has started before we
process its ack, when we return the execlists state is well defined.
Fixes: 06289949b8dd ("drm/i915/selftests: Check for any sign of request starting in wait_for_submit()")
Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
Acked-by: Matthew Auld <matthew.auld@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20200218211215.1336341-1-chris@chris-wilson.co.uk
| -rw-r--r-- | drivers/gpu/drm/i915/gt/selftest_lrc.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/drivers/gpu/drm/i915/gt/selftest_lrc.c b/drivers/gpu/drm/i915/gt/selftest_lrc.c index 7b303d5fd5b8..a9c9cfb2def8 100644 --- a/drivers/gpu/drm/i915/gt/selftest_lrc.c +++ b/drivers/gpu/drm/i915/gt/selftest_lrc.c @@ -77,11 +77,11 @@ static int wait_for_submit(struct intel_engine_cs *engine, cond_resched(); intel_engine_flush_submission(engine); - if (i915_request_is_active(rq) && - !READ_ONCE(engine->execlists.pending[0])) { - tasklet_unlock_wait(&engine->execlists.tasklet); + if (READ_ONCE(engine->execlists.pending[0])) + continue; + + if (i915_request_is_active(rq)) return 0; - } if (i915_request_started(rq)) /* that was quick! */ return 0; |