Commit 535b2f5e authored by Dave Gordon's avatar Dave Gordon Committed by Tvrtko Ursulin

drm/i915/guc: downgrade some DRM_ERROR() messages to DRM_WARN()

Where we're going to continue regardless of the problem, rather than
fail, then the message should be a WARNing rather than an ERROR.
Signed-off-by: default avatarDave Gordon <david.s.gordon@intel.com>
Reviewed-by: default avatarTvrtko Ursulin <tvrtko.ursulin@intel.com>
Signed-off-by: default avatarTvrtko Ursulin <tvrtko.ursulin@intel.com>
parent 30b0da8d
...@@ -114,10 +114,8 @@ static int host2guc_action(struct intel_guc *guc, u32 *data, u32 len) ...@@ -114,10 +114,8 @@ static int host2guc_action(struct intel_guc *guc, u32 *data, u32 len)
if (ret != -ETIMEDOUT) if (ret != -ETIMEDOUT)
ret = -EIO; ret = -EIO;
DRM_ERROR("GUC: host2guc action 0x%X failed. ret=%d " DRM_WARN("Action 0x%X failed; ret=%d status=0x%08X response=0x%08X\n",
"status=0x%08X response=0x%08X\n", data[0], ret, status, I915_READ(SOFT_SCRATCH(15)));
data[0], ret, status,
I915_READ(SOFT_SCRATCH(15)));
dev_priv->guc.action_fail += 1; dev_priv->guc.action_fail += 1;
dev_priv->guc.action_err = ret; dev_priv->guc.action_err = ret;
...@@ -552,7 +550,7 @@ static int guc_ring_doorbell(struct i915_guc_client *gc) ...@@ -552,7 +550,7 @@ static int guc_ring_doorbell(struct i915_guc_client *gc)
if (db_ret.db_status == GUC_DOORBELL_DISABLED) if (db_ret.db_status == GUC_DOORBELL_DISABLED)
break; break;
DRM_ERROR("Cookie mismatch. Expected %d, returned %d\n", DRM_WARN("Cookie mismatch. Expected %d, found %d\n",
db_cmp.cookie, db_ret.cookie); db_cmp.cookie, db_ret.cookie);
/* update the cookie to newly read cookie from GuC */ /* update the cookie to newly read cookie from GuC */
...@@ -734,7 +732,7 @@ static void guc_init_doorbell_hw(struct intel_guc *guc) ...@@ -734,7 +732,7 @@ static void guc_init_doorbell_hw(struct intel_guc *guc)
/* Restore to original value */ /* Restore to original value */
err = guc_update_doorbell_id(guc, client, db_id); err = guc_update_doorbell_id(guc, client, db_id);
if (err) if (err)
DRM_ERROR("Failed to restore doorbell to %d, err %d\n", DRM_WARN("Failed to restore doorbell to %d, err %d\n",
db_id, err); db_id, err);
/* Read back & verify all doorbell registers */ /* Read back & verify all doorbell registers */
...@@ -824,8 +822,6 @@ guc_client_alloc(struct drm_i915_private *dev_priv, ...@@ -824,8 +822,6 @@ guc_client_alloc(struct drm_i915_private *dev_priv,
return client; return client;
err: err:
DRM_ERROR("FAILED to create priority %u GuC client!\n", priority);
guc_client_free(dev_priv, client); guc_client_free(dev_priv, client);
return NULL; return NULL;
} }
...@@ -1005,7 +1001,7 @@ int i915_guc_submission_enable(struct drm_i915_private *dev_priv) ...@@ -1005,7 +1001,7 @@ int i915_guc_submission_enable(struct drm_i915_private *dev_priv)
GUC_CTX_PRIORITY_KMD_NORMAL, GUC_CTX_PRIORITY_KMD_NORMAL,
dev_priv->kernel_context); dev_priv->kernel_context);
if (!client) { if (!client) {
DRM_ERROR("Failed to create execbuf guc_client\n"); DRM_ERROR("Failed to create normal GuC client!\n");
return -ENOMEM; return -ENOMEM;
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment