[Intel-gfx] [PATCH] drm/i915/guc: Clear enable_guc_loading in case of init failure

[Michal Wajdeczko]

On Fri, Jun 02, 2017 at 04:46:54PM -0700, Michel Thierry wrote:
> And prevent calling i915_ggtt_disable_guc twice (the first when GuC init
> failed, and the second time during driver unload / intel_uc_fini_hw),
> and hitting the GEM_BUG_ON.
> 
> Fixes: 04f7b24eccdf ("drm/i915/guc: Assert that we switch between known
> ggtt->invalidate functions")
> Cc: Chris Wilson <chris at chris-wilson.co.uk>
> Cc: Michal Wajdeczko <michal.wajdeczko at intel.com>
> Cc: Joonas Lahtinen <joonas.lahtinen at linux.intel.com>
> Signed-off-by: Michel Thierry <michel.thierry at intel.com>
> ---
>  drivers/gpu/drm/i915/intel_uc.c | 5 +++++
>  1 file changed, 5 insertions(+)
> 
> diff --git a/drivers/gpu/drm/i915/intel_uc.c b/drivers/gpu/drm/i915/intel_uc.c
> index 3524ff07a0f2..c5ef4fa2b404 100644
> --- a/drivers/gpu/drm/i915/intel_uc.c
> +++ b/drivers/gpu/drm/i915/intel_uc.c
> @@ -433,6 +433,11 @@ int intel_uc_init_hw(struct drm_i915_private *dev_priv)
>  		DRM_NOTE("Falling back from GuC submission to execlist mode\n");
>  	}
>  
> +	if (i915.enable_guc_loading) {

This check is redundant (see top of this function)

Michal

> +		i915.enable_guc_loading = 0;
> +		DRM_NOTE("GuC firmware loading disabled\n");
> +	}
> +
>  	return ret;
>  }
>  
> -- 
> 2.11.0
>