[Intel-gfx] [PATCH 3/7] drm/i915/uc: Skip GuC HW unwinding if GuC is already dead

[Chris Wilson]

Quoting Michal Wajdeczko (2019-05-17 17:22:23)
> We should not attempt to unwind GuC hardware/firmware setup
> if we already have sanitized GuC.
> 
> Signed-off-by: Michal Wajdeczko <michal.wajdeczko at intel.com>
> Cc: Chris Wilson <chris at chris-wilson.co.uk>
> Cc: Daniele Ceraolo Spurio <daniele.ceraolospurio at intel.com>
> ---
>  drivers/gpu/drm/i915/intel_uc.c | 3 +++
>  1 file changed, 3 insertions(+)
> 
> diff --git a/drivers/gpu/drm/i915/intel_uc.c b/drivers/gpu/drm/i915/intel_uc.c
> index 01683d107348..9d86cd831ea7 100644
> --- a/drivers/gpu/drm/i915/intel_uc.c
> +++ b/drivers/gpu/drm/i915/intel_uc.c
> @@ -465,6 +465,9 @@ void intel_uc_fini_hw(struct drm_i915_private *i915)
>  
>         GEM_BUG_ON(!HAS_GUC(i915));
>  
> +       if (!intel_guc_is_alive(guc))
> +               return;
> +

Something else along these lines would be avoiding

https://bugs.freedesktop.org/show_bug.cgi?id=110622

I presume you can think of something a bit more precise to skip guc
selftests if guc initialisation failed.
-Chris