[Intel-gfx] [PATCH v2 15/15] drm/i915: Remove one level of indention from wait-for-execute

[Tvrtko Ursulin]

On 22/02/2017 11:46, Chris Wilson wrote:
> Now that the code is getting simpler, we can reduce the indentation when
> waiting for the global_seqno.
>
> Signed-off-by: Chris Wilson <chris at chris-wilson.co.uk>
> ---
>  drivers/gpu/drm/i915/i915_gem_request.c | 41 +++++++++++++++------------------
>  1 file changed, 18 insertions(+), 23 deletions(-)
>
> diff --git a/drivers/gpu/drm/i915/i915_gem_request.c b/drivers/gpu/drm/i915/i915_gem_request.c
> index 00ec3dbca184..d7e72aed1bd3 100644
> --- a/drivers/gpu/drm/i915/i915_gem_request.c
> +++ b/drivers/gpu/drm/i915/i915_gem_request.c
> @@ -1089,34 +1089,29 @@ long i915_wait_request(struct drm_i915_gem_request *req,
>  	wait.tsk = current;
>
>  restart:
> -	wait.seqno = i915_gem_request_global_seqno(req);
> -	if (!wait.seqno) {
> -		do {
> -			set_current_state(state);
> -
> -			wait.seqno = i915_gem_request_global_seqno(req);
> -			if (wait.seqno)
> -				break;
> +	do {
> +		set_current_state(state);
> +		wait.seqno = i915_gem_request_global_seqno(req);
> +		if (wait.seqno)
> +			break;
>
> -			if (flags & I915_WAIT_LOCKED &&
> -			    __i915_reset_request(req))
> -				continue;
> +		if (flags & I915_WAIT_LOCKED && __i915_reset_request(req))
> +			continue;
>
> -			if (signal_pending_state(state, current)) {
> -				timeout = -ERESTARTSYS;
> -				goto complete;
> -			}
> +		if (signal_pending_state(state, current)) {
> +			timeout = -ERESTARTSYS;
> +			goto complete;
> +		}
>
> -			if (!timeout) {
> -				timeout = -ETIME;
> -				goto complete;
> -			}
> +		if (!timeout) {
> +			timeout = -ETIME;
> +			goto complete;
> +		}
>
> -			timeout = io_schedule_timeout(timeout);
> -		} while (1);
> +		timeout = io_schedule_timeout(timeout);
> +	} while (1);
>
> -		GEM_BUG_ON(!wait.seqno);
> -	}
> +	GEM_BUG_ON(!wait.seqno);
>  	GEM_BUG_ON(!i915_sw_fence_signaled(&req->submit));
>
>  	/* Optimistic short spin before touching IRQs */
>

Reviewed-by: Tvrtko Ursulin <tvrtko.ursulin at intel.com>

Regards,

Tvrtko