@@ -141,7 +141,7 @@ int intel_guc_sample_forcewake(struct intel_guc *guc)
* intel_guc_enter_sleep() - notify GuC entering sleep state
* @guc: guc structure
*/
-int intel_guc_enter_sleep(struct intel_guc *guc)
+static int intel_guc_enter_sleep(struct intel_guc *guc)
{
struct drm_i915_private *dev_priv = guc_to_i915(guc);
struct i915_gem_context *ctx;
@@ -131,7 +131,6 @@ struct intel_guc {
void intel_guc_init_send_regs(struct intel_guc *guc);
int intel_guc_send_mmio(struct intel_guc *guc, const u32 *action, u32 len);
int intel_guc_sample_forcewake(struct intel_guc *guc);
-int intel_guc_enter_sleep(struct intel_guc *guc);
int intel_guc_runtime_suspend(struct intel_guc *guc);
int intel_guc_runtime_resume(struct intel_guc *guc);
@@ -410,9 +410,6 @@ void intel_uc_fini_hw(struct drm_i915_private *dev_priv)
if (!i915.enable_guc_loading)
return;
- if (i915.enable_guc_submission)
- i915_guc_submission_disable(dev_priv);
-
guc_disable_communication(&dev_priv->guc);
if (i915.enable_guc_submission) {
@@ -457,7 +454,16 @@ int intel_uc_runtime_resume(struct drm_i915_private *dev_priv)
int intel_uc_suspend(struct drm_i915_private *dev_priv)
{
- return intel_guc_enter_sleep(&dev_priv->guc);
+ int ret;
+
+ if (i915.enable_guc_submission)
+ i915_guc_submission_disable(dev_priv);
+
+ ret = intel_uc_runtime_suspend(dev_priv);
+ if (ret)
+ return ret;
+
+ return 0;
}
int intel_uc_resume(struct drm_i915_private *dev_priv)
With this patch we disable GuC submission in i915_drm_suspend. This will destroy the client which will be setup back again. We also reuse the complete sanitization done via intel_uc_runtime_suspend in this path. Post drm resume this state is recreated by intel_uc_init_hw hence we need not have similar reuse for intel_uc_resume. This also fixes issue where intel_uc_fini_hw was being called after GPU reset happening in i915_gem_suspend in i915_driver_unload. Cc: Michal Wajdeczko <michal.wajdeczko@intel.com> Cc: Michał Winiarski <michal.winiarski@intel.com> Signed-off-by: Sagar Arun Kamble <sagar.a.kamble@intel.com> --- drivers/gpu/drm/i915/intel_guc.c | 2 +- drivers/gpu/drm/i915/intel_guc.h | 1 - drivers/gpu/drm/i915/intel_uc.c | 14 ++++++++++---- 3 files changed, 11 insertions(+), 6 deletions(-)