@@ -879,9 +879,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 */
destroy_doorbell(client);
guc_stage_desc_fini(client->guc, client);
i915_gem_object_unpin_map(client->vma->obj);
@@ -1148,6 +1145,12 @@ int i915_guc_submission_enable(struct drm_i915_private *dev_priv)
sizeof(struct guc_wq_item) *
I915_NUM_ENGINES > GUC_WQ_SIZE);
+ /*
+ * Assert that drm.struct_mutex is held.
+ * Needed for GuC client vma binding.
+ */
+ lockdep_assert_held(&dev_priv->drm.struct_mutex);
+
if (!client) {
client = guc_client_alloc(dev_priv,
INTEL_INFO(dev_priv)->ring_mask,
@@ -1197,6 +1200,12 @@ void i915_guc_submission_disable(struct drm_i915_private *dev_priv)
{
struct intel_guc *guc = &dev_priv->guc;
+ /*
+ * Assert that drm.struct_mutex is held.
+ * Needed for GuC client vma unbinding.
+ */
+ lockdep_assert_held(&dev_priv->drm.struct_mutex);
+
guc_interrupts_release(dev_priv);
/* Revert back to manual ELSP submission */
@@ -447,9 +447,6 @@ void intel_uc_fini_hw(struct drm_i915_private *dev_priv)
if (!i915_modparams.enable_guc_loading)
return;
- if (i915_modparams.enable_guc_submission)
- i915_guc_submission_disable(dev_priv);
-
guc_disable_communication(&dev_priv->guc);
if (i915_modparams.enable_guc_submission) {
@@ -528,7 +525,13 @@ int intel_uc_runtime_resume(struct drm_i915_private *dev_priv)
int intel_uc_suspend(struct drm_i915_private *dev_priv)
{
- return intel_guc_suspend(dev_priv);
+ if (i915_modparams.enable_guc_submission) {
+ mutex_lock(&dev_priv->drm.struct_mutex);
+ i915_guc_submission_disable(dev_priv);
+ mutex_unlock(&dev_priv->drm.struct_mutex);
+ }
+
+ return intel_uc_runtime_suspend(dev_priv);
}
int intel_uc_resume(struct drm_i915_private *dev_priv)