Commit fcf7df7a authored by Chris Wilson's avatar Chris Wilson

drm/i915/selftests: Check for the error interrupt before we wait!

Sometimes the error interrupt can fire even before we have seen the
request go active -- in which case, we end up waiting until the timeout
as the request is already completed. Double check for this case!
Signed-off-by: default avatarChris Wilson <chris@chris-wilson.co.uk>
Reviewed-by: default avatarMatthew Auld <matthew.auld@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20200214120659.3888735-1-chris@chris-wilson.co.uk
parent 926b005c
......@@ -76,11 +76,15 @@ static int wait_for_submit(struct intel_engine_cs *engine,
do {
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);
return 0;
}
if (i915_request_completed(rq)) /* that was quick! */
return 0;
} while (time_before(jiffies, timeout));
return -ETIME;
......
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