Re: [PATCH v6 3/7] drm/i915/perf: simplify configure all context function

[Tvrtko Ursulin <tvrtko.ursulin@linux.intel.com>]

On 22/05/2018 18:59, Lionel Landwerlin wrote:
> We don't need any special treatment on error so just return as soon as
> possible.
> 
> Signed-off-by: Lionel Landwerlin <lionel.g.landwerlin@intel.com>
> ---
>   drivers/gpu/drm/i915/i915_perf.c | 11 ++++-------
>   1 file changed, 4 insertions(+), 7 deletions(-)
> 
> diff --git a/drivers/gpu/drm/i915/i915_perf.c b/drivers/gpu/drm/i915/i915_perf.c
> index 4f0eb84b3c00..805dfc732bba 100644
> --- a/drivers/gpu/drm/i915/i915_perf.c
> +++ b/drivers/gpu/drm/i915/i915_perf.c
> @@ -1762,7 +1762,7 @@ static int gen8_configure_all_contexts(struct drm_i915_private *dev_priv,
>   	/* Switch away from any user context. */
>   	ret = gen8_switch_to_updated_kernel_context(dev_priv, oa_config);
>   	if (ret)
> -		goto out;
> +		return ret;
>   
>   	/*
>   	 * The OA register config is setup through the context image. This image
> @@ -1779,7 +1779,7 @@ static int gen8_configure_all_contexts(struct drm_i915_private *dev_priv,
>   	 */
>   	ret = i915_gem_wait_for_idle(dev_priv, wait_flags);
>   	if (ret)
> -		goto out;
> +		return ret;
>   
>   	/* Update all contexts now that we've stalled the submission. */
>   	list_for_each_entry(ctx, &dev_priv->contexts.list, link) {
> @@ -1791,10 +1791,8 @@ static int gen8_configure_all_contexts(struct drm_i915_private *dev_priv,
>   			continue;
>   
>   		regs = i915_gem_object_pin_map(ce->state->obj, I915_MAP_WB);
> -		if (IS_ERR(regs)) {
> -			ret = PTR_ERR(regs);
> -			goto out;
> -		}
> +		if (IS_ERR(regs))
> +			return PTR_ERR(regs);
>   
>   		ce->state->obj->mm.dirty = true;
>   		regs += LRC_STATE_PN * PAGE_SIZE / sizeof(*regs);
> @@ -1804,7 +1802,6 @@ static int gen8_configure_all_contexts(struct drm_i915_private *dev_priv,
>   		i915_gem_object_unpin_map(ce->state->obj);
>   	}
>   
> - out:
>   	return ret;
>   }
>   
> 

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

Regards,

Tvrtko
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx