[PATCH v4 3/7] drm/i915/uc: Fully sanitize uC in uc_fini_hw

[Michal Wajdeczko]

On Fri, 23 Mar 2018 00:48:55 +0100, Anusha Srivatsa  
<anusha.srivatsa at intel.com> wrote:

> On Wed, Mar 21, 2018 at 05:32:58PM +0000, Michal Wajdeczko wrote:
>> Today uc_fini_hw is subset of uc_sanitize, but remaining
>> code in sanitize function is also desired for uc_fini_hw.
>> Instead of duplicating the code, just call uc_sanitize.
>>
>> Signed-off-by: Michal Wajdeczko <michal.wajdeczko at intel.com>
>> Cc: Sagar Arun Kamble <sagar.a.kamble at intel.com>
>> Cc: Chris Wilson <chris at chris-wilson.co.uk>
>> ---
>>  drivers/gpu/drm/i915/intel_uc.c | 14 ++------------
>>  1 file changed, 2 insertions(+), 12 deletions(-)
>>
>> diff --git a/drivers/gpu/drm/i915/intel_uc.c  
>> b/drivers/gpu/drm/i915/intel_uc.c
>> index bec8df8..d1feb85 100644
>> --- a/drivers/gpu/drm/i915/intel_uc.c
>> +++ b/drivers/gpu/drm/i915/intel_uc.c
>> @@ -434,19 +434,9 @@ int intel_uc_init_hw(struct drm_i915_private  
>> *dev_priv)
>>  	return ret;
>>  }
>>
>> -void intel_uc_fini_hw(struct drm_i915_private *dev_priv)
>> +void intel_uc_fini_hw(struct drm_i915_private *i915)
>>  {
>> -	struct intel_guc *guc = &dev_priv->guc;
>> -
>> -	if (!USES_GUC(dev_priv))
>> -		return;
>> -
>> -	GEM_BUG_ON(!HAS_GUC(dev_priv));
>> -
>> -	if (USES_GUC_SUBMISSION(dev_priv))
>> -		intel_guc_submission_disable(guc);
>> -
>> -	guc_disable_communication(guc);
>> +	intel_uc_sanitize(i915);
>>  }
>
> Why not just have intel_uc_sanitize()?
>

I wanted to keep fini_hw mainly for symmetry with init_hw.
Also note that we are calling them on different scenarios.

/m