[Intel-gfx] [PATCH v4 3/9] drm/i915/guc: Update GuC ggtt.invalidate/interrupts/communication across RPM suspend/resume

[Sagar Arun Kamble]

On 9/21/2017 3:03 AM, Michal Wajdeczko wrote:
> On Wed, 20 Sep 2017 19:38:18 +0200, Sagar Arun Kamble 
> <sagar.a.kamble at intel.com> wrote:
>
>> Apart from configuring interrupts, we need to update the ggtt invalidate
>> interface and GuC communication on suspend. This functionality can be
>> reused for other suspend and reset paths.
>> Prepared GuC specific helpers to handle these suspend/resume tasks
>> namely - intel_guc_runtime_suspend, intel_guc_runtime_resume.
>>
>> v2: Rebase w.r.t removal of GuC code restructuring.
>>
>> Cc: Michal Wajdeczko <michal.wajdeczko at intel.com>
>> Cc: Michał Winiarski <michal.winiarski at intel.com>
>> Signed-off-by: Sagar Arun Kamble <sagar.a.kamble at intel.com>
>> ---
>>  drivers/gpu/drm/i915/intel_uc.c | 66 
>> ++++++++++++++++++++++++++++++++++++-----
>>  1 file changed, 59 insertions(+), 7 deletions(-)
>>
>> diff --git a/drivers/gpu/drm/i915/intel_uc.c 
>> b/drivers/gpu/drm/i915/intel_uc.c
>> index 0dbb4b9..fa698db 100644
>> --- a/drivers/gpu/drm/i915/intel_uc.c
>> +++ b/drivers/gpu/drm/i915/intel_uc.c
>> @@ -551,8 +551,6 @@ static int intel_guc_enter_sleep(struct intel_guc 
>> *guc)
>>      if (guc->fw.load_status != INTEL_UC_FIRMWARE_SUCCESS)
>>          return 0;
>> -    gen9_disable_guc_interrupts(dev_priv);
>> -
>>      ctx = dev_priv->kernel_context;
>>     data[0] = INTEL_GUC_ACTION_ENTER_S_STATE;
>> @@ -577,9 +575,6 @@ static int intel_guc_exit_sleep(struct intel_guc 
>> *guc)
>>      if (guc->fw.load_status != INTEL_UC_FIRMWARE_SUCCESS)
>>          return 0;
>> -    if (i915.guc_log_level >= 0)
>> -        gen9_enable_guc_interrupts(dev_priv);
>> -
>>      ctx = dev_priv->kernel_context;
>>     data[0] = INTEL_GUC_ACTION_EXIT_S_STATE;
>> @@ -590,14 +585,71 @@ static int intel_guc_exit_sleep(struct 
>> intel_guc *guc)
>>      return intel_guc_send(guc, data, ARRAY_SIZE(data));
>>  }
>> +int intel_guc_runtime_suspend(struct intel_guc *guc)
>> +{
>> +    struct drm_i915_private *dev_priv = guc_to_i915(guc);
>> +    int ret;
>> +
>> +    ret = intel_guc_enter_sleep(guc);
>> +    if (ret) {
>> +        DRM_ERROR("GuC enter sleep failed (%d)\n", ret);
>> +        return ret;
>> +    }
>> +
>> +    i915_ggtt_disable_guc(dev_priv);
>> +    gen9_disable_guc_interrupts(dev_priv);
>
> To match existing approach in intel_uc_init_hw() move interrupts
> control to uc_runtime_suspend()
Yes. Will update as suggested.
>
>> +
>> +    return 0;
>> +}
>> +
>> +int intel_guc_runtime_resume(struct intel_guc *guc)
>> +{
>> +    struct drm_i915_private *dev_priv = guc_to_i915(guc);
>> +    int ret;
>> +
>> +    if (i915.guc_log_level >= 0)
>> +        gen9_enable_guc_interrupts(dev_priv);
>
> Similar here
Yes. Will update as suggested.
>
>> +    i915_ggtt_enable_guc(dev_priv);
>> +
>> +    ret = intel_guc_exit_sleep(guc);
>> +    if (ret) {
>> +        DRM_ERROR("GuC exit sleep failed (%d)\n", ret);
>> +        return ret;
>> +    }
>> +
>> +    return 0;
>> +}
>> +
>>  int intel_uc_runtime_suspend(struct drm_i915_private *dev_priv)
>>  {
>> -    return intel_guc_enter_sleep(&dev_priv->guc);
>> +    int ret;
>> +
>> +    if (!i915.enable_guc_loading)
>> +        return 0;
>> +
>> +    ret = intel_guc_runtime_suspend(&dev_priv->guc);
>> +    if (ret)
>> +        return ret;
>> +
>> +    guc_disable_communication(&dev_priv->guc);
>> +
>> +    return 0;
>>  }
>> int intel_uc_runtime_resume(struct drm_i915_private *dev_priv)
>>  {
>> -    return intel_guc_exit_sleep(&dev_priv->guc);
>> +    int ret;
>> +
>> +    if (!i915.enable_guc_loading)
>> +        return 0;
>> +
>> +    ret = guc_enable_communication(&dev_priv->guc);
>> +    if (ret) {
>> +        DRM_ERROR("GuC enable communication failed (%d)\n", ret);
>> +        return ret;
>> +    }
>> +
>> +    return intel_guc_runtime_resume(&dev_priv->guc);
>>  }
>> int intel_uc_suspend(struct drm_i915_private *dev_priv)