[Intel-gfx] [PATCH v4 1/7] drm/i915: Correctly handle error path in i915_gem_init_hw

[Sagar Arun Kamble]

On 3/23/2018 8:44 PM, Michal Wajdeczko wrote:
> In function gem_init_hw() we are calling uc_init_hw() but in case
> of error later in function, we missed to call matching uc_fini_hw()
>
> Signed-off-by: Michal Wajdeczko <michal.wajdeczko at intel.com>
> Cc: Sagar Arun Kamble <sagar.a.kamble at intel.com>
> Cc: Chris Wilson <chris at chris-wilson.co.uk>
Looks good.
Reviewed-by: Sagar Arun Kamble <sagar.a.kamble at intel.com>
> ---
>   drivers/gpu/drm/i915/i915_gem.c | 6 ++++++
>   1 file changed, 6 insertions(+)
>
> diff --git a/drivers/gpu/drm/i915/i915_gem.c b/drivers/gpu/drm/i915/i915_gem.c
> index 802df8e..7fad180 100644
> --- a/drivers/gpu/drm/i915/i915_gem.c
> +++ b/drivers/gpu/drm/i915/i915_gem.c
> @@ -5171,9 +5171,15 @@ int i915_gem_init_hw(struct drm_i915_private *dev_priv)
>   
>   	/* Only when the HW is re-initialised, can we replay the requests */
>   	ret = __i915_gem_restart_engines(dev_priv);
> +	if (ret)
> +		goto cleanup_uc;
>   out:
>   	intel_uncore_forcewake_put(dev_priv, FORCEWAKE_ALL);
>   	return ret;
> +
> +cleanup_uc:
> +	intel_uc_fini_hw(dev_priv);
> +	goto out;
>   }
>   
>   static int __intel_engines_record_defaults(struct drm_i915_private *i915)

-- 
Thanks,
Sagar