@@ -1063,8 +1063,10 @@ long i915_wait_request(struct drm_i915_gem_request *req,
trace_i915_gem_request_wait_begin(req);
add_wait_queue(&req->execute, &exec);
- if (flags & I915_WAIT_LOCKED)
+ if (flags & I915_WAIT_LOCKED) {
add_wait_queue(errq, &reset);
+ __i915_reset_request(req);
+ }
wait.tsk = current;
@@ -1099,7 +1101,8 @@ long i915_wait_request(struct drm_i915_gem_request *req,
goto complete;
set_current_state(state);
- if (intel_engine_add_wait(req->engine, &wait))
+ if (intel_engine_add_wait(req->engine, &wait) ||
+ flags & I915_WAIT_LOCKED)
/* In order to check that we haven't missed the interrupt
* as we enabled it, we need to kick ourselves to do a
* coherent check on the seqno before we sleep.
As we handoff the GPU reset to the waiter, we need to check we don't miss a wakeup if it has already been sent prior to us starting the wait. Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk> --- drivers/gpu/drm/i915/i915_gem_request.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-)