[Intel-gfx] [PATCH 1/2] drm/i915: Tidy reporting busy status during i915_gem_retire_requests()

[Joonas Lahtinen]

On ti, 2016-08-16 at 16:45 +0100, Chris Wilson wrote:
> As we know by inspection whether any engine is still busy as we retire
> all the requests, we can pass that information back via return value
> rather than check again afterwards.
> 
> v2: A little more polish missed in patch splitting
> 
> Signed-off-by: Chris Wilson <chris at chris-wilson.co.uk>
> Cc: Mika Kuoppala <mika.kuoppala at intel.com>
> ---
>  drivers/gpu/drm/i915/i915_gem_request.c | 11 ++++++-----
>  1 file changed, 6 insertions(+), 5 deletions(-)
> 
> diff --git a/drivers/gpu/drm/i915/i915_gem_request.c b/drivers/gpu/drm/i915/i915_gem_request.c
> index bf62427a35b7..02242736e492 100644
> --- a/drivers/gpu/drm/i915/i915_gem_request.c
> +++ b/drivers/gpu/drm/i915/i915_gem_request.c
> @@ -727,16 +727,18 @@ complete:
>  	return ret;
>  }
>  
> -static void engine_retire_requests(struct intel_engine_cs *engine)
> +static bool engine_retire_requests(struct intel_engine_cs *engine)
>  {
>  	struct drm_i915_gem_request *request, *next;
>  
>  	list_for_each_entry_safe(request, next, &engine->request_list, link) {
>  		if (!i915_gem_request_completed(request))
> -			break;
> +			return false;
>  
>  		i915_gem_request_retire(request);
>  	}
> +
> +	return true;
>  }
>  
>  void i915_gem_retire_requests(struct drm_i915_private *dev_priv)
> @@ -750,9 +752,8 @@ void i915_gem_retire_requests(struct drm_i915_private *dev_priv)
>  
>  	GEM_BUG_ON(!dev_priv->gt.awake);
>  
> -	for_each_engine(engine, dev_priv) {
> -		engine_retire_requests(engine);
> -		if (!intel_engine_is_active(engine))
> +	for_each_engine_masked(engine, dev_priv, dev_priv->gt.active_engines) {
> +		if (engine_retire_requests(engine))
>  			dev_priv->gt.active_engines &= ~intel_engine_flag(engine);
>  	}

Drop the braces.

Reviewed-by: Joonas Lahtinen <joonas.lahtinen at linux.intel.com>

Regards, Joonas
-- 
Joonas Lahtinen
Open Source Technology Center
Intel Corporation