On to, 2017-02-02 at 15:13 +0000, Chris Wilson wrote:
> It had only one callsite and existed to keep the code clearer. Now
> having shared the wait-on-error between phases and with plans to change
> the wait-for-execute in the next few patches, remove the out of line
> wait loop and move it into the main body of i915_wait_request.
>
> Signed-off-by: Chris Wilson <chris@xxxxxxxxxxxxxxxxxx>
<SNIP>
> @@ -1080,7 +1037,30 @@ long i915_wait_request(struct drm_i915_gem_request *req,
> add_wait_queue(errq, &reset);
>
> if (!i915_sw_fence_done(&req->execute)) {
> - timeout = __i915_request_wait_for_execute(req, flags, timeout);
> + DEFINE_WAIT(exec);
> +
> + do {
> + prepare_to_wait(&req->execute.wait, &exec, state);
> + if (i915_sw_fence_done(&req->execute))
> + break;
> +
> + if (flags & I915_WAIT_LOCKED &&
> + i915_reset_in_progress(&req->i915->gpu_error)) {
> + __set_current_state(TASK_RUNNING);
> + i915_reset(req->i915);
I'm no the expert here, but this reads funnily; "if reset in progress,
do reset".
This was pre-existing code, so;
Reviewed-by: Joonas Lahtinen <joonas.lahtine@xxxxxxxxxxxxxxx>
Regards, Joonas
--
Joonas Lahtinen
Open Source Technology Center
Intel Corporation
_______________________________________________
Intel-gfx mailing list
Intel-gfx@xxxxxxxxxxxxxxxxxxxxx
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
