[Intel-gfx] [PATCH 5/8] drm/i915/guc: Disable global reset

Mika Kuoppala mika.kuoppala at linux.intel.com
Thu Jan 17 14:24:30 UTC 2019


Chris Wilson <chris at chris-wilson.co.uk> writes:

> The guc (and huc) currently inexcruitably depend on struct_mutex for
> device reinitialisation from inside the reset, and indeed taking any
> mutex here is verboten (as we must be able to reset from underneath any
> of our mutexes). That makes recovering the guc unviable without, for
> example, reserving contiguous vma space and pages for it to use.
>
> Signed-off-by: Chris Wilson <chris at chris-wilson.co.uk>

Acked-by: Mika Kuoppala <mika.kuoppala at linux.intel.com>

We do want ack from Daniele as well.

-Mika

> ---
>  drivers/gpu/drm/i915/i915_reset.c | 3 +++
>  1 file changed, 3 insertions(+)
>
> diff --git a/drivers/gpu/drm/i915/i915_reset.c b/drivers/gpu/drm/i915/i915_reset.c
> index f9512e07646d..c9a844d2626f 100644
> --- a/drivers/gpu/drm/i915/i915_reset.c
> +++ b/drivers/gpu/drm/i915/i915_reset.c
> @@ -590,6 +590,9 @@ int intel_gpu_reset(struct drm_i915_private *i915, unsigned int engine_mask)
>  
>  bool intel_has_gpu_reset(struct drm_i915_private *i915)
>  {
> +	if (USES_GUC(i915))
> +		return false;
> +
>  	return intel_get_gpu_reset(i915);
>  }
>  
> -- 
> 2.20.1


More information about the Intel-gfx mailing list