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

[Daniele Ceraolo Spurio]

On 01/17/2019 06:24 AM, Mika Kuoppala wrote:
> 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.
> 

As long as no one opposes the temporary arrangement we discussed to 
re-enable the reset with guc (perma-pinning the firmware in the GuC 
unaccessible range of the GGTT),

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

Daniele

> -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