[PATCH 16/22] drm/i915/guc: Update GuC functionality in intel_uc_suspend/intel_uc_resume
Sagar Arun Kamble
sagar.a.kamble at intel.com
Thu Oct 5 11:22:09 UTC 2017
With this patch we disable GuC submission in i915_drm_suspend path.
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. We have added resume functionality but currently it will
not be triggered as GuC is reset at the end of suspend. So we depend
on intel_uc_resume post intel_uc_init_hw in i915_drm_resume.
This also fixes issue where intel_uc_fini_hw was being called after
GPU reset happening in i915_gem_suspend during i915_driver_unload.
v2: Rebase w.r.t removal of GuC code restructuring. Added struct_mutex
protection for i915_guc_submission_disable.
v3: Rebase w.r.t updated GuC suspend function name.
v4: Added lockdep assert in i915_guc_submission_enable/disable.
Refined intel_uc_suspend to remove unnecessary locals and simplify
return. (Michal Winiarski)
Removed comment in guc_client_free about ignoring failure for
Rebase w.r.t i915_modparams change.
v5: Removed lockdep assert as mutex is needed by internal functions
which already have the asserts. (Chris)
Removed enable_guc_submission check for disabling GuC submission. (Chris)
v6: Rebase with enable_guc_submission related change done in earlier
newly introduced patches.
v7: Fixed intel_uc_resume to call intel_uc_runtime_resume and added
comment about need to enable submission later if needed. Commit message
v9: Rebase. Updated comment.
Signed-off-by: Sagar Arun Kamble <sagar.a.kamble at intel.com>
Cc: Michal Wajdeczko <michal.wajdeczko at intel.com>
Cc: Michał Winiarski <michal.winiarski at intel.com>
Cc: Joonas Lahtinen <joonas.lahtinen at linux.intel.com>
Reviewed-by: Michał Winiarski <michal.winiarski at intel.com>
drivers/gpu/drm/i915/i915_guc_submission.c | 3 ---
drivers/gpu/drm/i915/intel_uc.c | 18 ++++++++++++++----
2 files changed, 14 insertions(+), 7 deletions(-)
diff --git a/drivers/gpu/drm/i915/i915_guc_submission.c b/drivers/gpu/drm/i915/i915_guc_submission.c
index dc67421..10aded8 100644
@@ -844,9 +844,6 @@ static void guc_client_free(struct i915_guc_client *client)
* Be sure to drop any locks
- /* FIXME: in many cases, by the time we get here the GuC has been
- * reset, so we cannot destroy the doorbell properly. Ignore the
- * error message for now */
diff --git a/drivers/gpu/drm/i915/intel_uc.c b/drivers/gpu/drm/i915/intel_uc.c
index d8d5d5a..1c68072 100644
@@ -280,8 +280,6 @@ void intel_uc_fini_hw(struct drm_i915_private *dev_priv)
@@ -361,10 +359,22 @@ void intel_uc_runtime_resume(struct drm_i915_private *dev_priv)
void intel_uc_suspend(struct drm_i915_private *dev_priv)
void intel_uc_resume(struct drm_i915_private *dev_priv)
+ * TODO: intel_uc_suspend disables GuC submission. This is
+ * needed for unload path as well. Also, GuC is reset at the end
+ * of suspend which makes disabling submission post that not
+ * possible. Hence we re-enable submission during intel_uc_init_hw.
+ * Once reset at the end of suspend is removed we need to enable
+ * GuC submission post resuming GuC here.
More information about the Intel-gfx-trybot