[Intel-gfx] [PATCH 1/1] drm/i915/guc: Preparing for GuC reset along with engine reset

[Daniele Ceraolo Spurio]

On 3/7/19 10:44 AM, Sujaritha Sundaresan wrote:
> Adding the call to prepare for guc reset along with engine
> reset. intel_uc_reset_prepare() calls to disable guc communication
> and to sanitize.
> 
> Cc: Daniele Ceraolo Spurio <daniele.ceraolospurio at intel.com>
> Cc: Michal Wajdeczko <michal.wajdeczko at intel.com>
> Signed-off-by: Sujaritha Sundaresan <sujaritha.sundaresan at intel.com>

Reviewed-by: Daniele Ceraolo Spurio <daniele.ceraolospurio at intel.com>

> ---
>   drivers/gpu/drm/i915/i915_reset.c | 2 ++
>   1 file changed, 2 insertions(+)
> 
> diff --git a/drivers/gpu/drm/i915/i915_reset.c b/drivers/gpu/drm/i915/i915_reset.c
> index 3fbaa72a9eac..dcaa33b72636 100644
> --- a/drivers/gpu/drm/i915/i915_reset.c
> +++ b/drivers/gpu/drm/i915/i915_reset.c
> @@ -820,6 +820,8 @@ static void __i915_gem_set_wedged(struct drm_i915_private *i915)
>   	for_each_engine(engine, i915, id)
>   		reset_prepare_engine(engine);
>   
> +	intel_uc_reset_prepare(i915);
> +
>   	/* Even if the GPU reset fails, it should still stop the engines */
>   	if (!INTEL_INFO(i915)->gpu_reset_clobbers_display)
>   		intel_gpu_reset(i915, ALL_ENGINES);
>