[Intel-gfx] [PATCH v4 7/9] drm/i915/guc: Remove i915_guc_log_unregister

[Sagar Arun Kamble]

On 9/21/2017 2:28 AM, Michal Wajdeczko wrote:
> On Wed, 20 Sep 2017 19:38:22 +0200, Sagar Arun Kamble 
> <sagar.a.kamble at intel.com> wrote:
>
>> Functionality needed to disable GuC interrupts and cleanup the
>> runtime/relay data structures is already covered in the unload path
>> via intel_guc_fini_hw and intel_guc_cleanup hence remove
>> i915_guc_log_unregister
>>
>> v2: Removed the function i915_guc_log_unregister.
>>
>> v3: Rebase as intel_guc.h is removed.
>>
>> v4: Rebase as intel_guc.h is created again. :)
>>
>> v5: Rebase as intel_guc.h is removed.
>>
>> Cc: Michal Wajdeczko <michal.wajdeczko at intel.com>
>> Reviewed-by: Michal Wajdeczko <michal.wajdeczko at intel.com>
>
> I'm afraid I've to revoke my r-b as with removal of the log_unregister()
> we will loose symmetry with log_register() where relay_late_setup_files()
> was hidden, and we should still clean it up in i915_driver_unregister()
>
> Michal
Agree with you. We will need to maintain symmetry. Will revisit with 
separate patches.
Better to integrate in the CT series I guess as there are multiple 
logging related
interrupt enable/disable occurrences.

>
>> Signed-off-by: Sagar Arun Kamble <sagar.a.kamble at intel.com>
>> ---
>>  drivers/gpu/drm/i915/i915_drv.c      |  1 -
>>  drivers/gpu/drm/i915/intel_guc_log.c | 12 ------------
>>  drivers/gpu/drm/i915/intel_uc.h      |  1 -
>>  3 files changed, 14 deletions(-)
>>
>> diff --git a/drivers/gpu/drm/i915/i915_drv.c 
>> b/drivers/gpu/drm/i915/i915_drv.c
>> index 6f36ced..c69a30a 100644
>> --- a/drivers/gpu/drm/i915/i915_drv.c
>> +++ b/drivers/gpu/drm/i915/i915_drv.c
>> @@ -1252,7 +1252,6 @@ static void i915_driver_unregister(struct 
>> drm_i915_private *dev_priv)
>>      i915_perf_unregister(dev_priv);
>>     i915_teardown_sysfs(dev_priv);
>> -    i915_guc_log_unregister(dev_priv);
>>      drm_dev_unregister(&dev_priv->drm);
>>     i915_gem_shrinker_cleanup(dev_priv);
>> diff --git a/drivers/gpu/drm/i915/intel_guc_log.c 
>> b/drivers/gpu/drm/i915/intel_guc_log.c
>> index 16d3b87..3c45681 100644
>> --- a/drivers/gpu/drm/i915/intel_guc_log.c
>> +++ b/drivers/gpu/drm/i915/intel_guc_log.c
>> @@ -648,15 +648,3 @@ void i915_guc_log_register(struct 
>> drm_i915_private *dev_priv)
>>      guc_log_late_setup(&dev_priv->guc);
>>      mutex_unlock(&dev_priv->drm.struct_mutex);
>>  }
>> -
>> -void i915_guc_log_unregister(struct drm_i915_private *dev_priv)
>> -{
>> -    if (!i915.enable_guc_submission)
>> -        return;
>> -
>> -    mutex_lock(&dev_priv->drm.struct_mutex);
>> -    /* GuC logging is currently the only user of Guc2Host interrupts */
>> -    gen9_disable_guc_interrupts(dev_priv);
>> -    guc_log_runtime_destroy(&dev_priv->guc);
>> -    mutex_unlock(&dev_priv->drm.struct_mutex);
>> -}
>> diff --git a/drivers/gpu/drm/i915/intel_uc.h 
>> b/drivers/gpu/drm/i915/intel_uc.h
>> index 8557e33..c2c104a 100644
>> --- a/drivers/gpu/drm/i915/intel_uc.h
>> +++ b/drivers/gpu/drm/i915/intel_uc.h
>> @@ -244,7 +244,6 @@ static inline void intel_guc_notify(struct 
>> intel_guc *guc)
>>  void intel_guc_log_destroy(struct intel_guc *guc);
>>  int i915_guc_log_control(struct drm_i915_private *dev_priv, u64 
>> control_val);
>>  void i915_guc_log_register(struct drm_i915_private *dev_priv);
>> -void i915_guc_log_unregister(struct drm_i915_private *dev_priv);
>> static inline u32 guc_ggtt_offset(struct i915_vma *vma)
>>  {