aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichał Winiarski <michal.winiarski@intel.com>2018-03-19 05:53:47 -0400
committerChris Wilson <chris@chris-wilson.co.uk>2018-03-19 08:23:02 -0400
commitfeb06c151fade9ecaa3dd410d792cce26e8b10de (patch)
tree787e6f4c1b46081d0ae4854c6427c3ea423af04f
parent9605d1ce7c6bcb673b6893ac12b565f1bde8f0bc (diff)
drm/i915/guc: Demote GuC error messages
We're using those functions in selftests, and the callers are expected to do the error handling anyways. Let's demote all GuC actions and doorbell creation to DEBUG_DRIVER. Signed-off-by: Michał Winiarski <michal.winiarski@intel.com> Cc: Michal Wajdeczko <michal.wajdeczko@intel.com> Cc: Michel Thierry <michel.thierry@intel.com> Cc: Chris Wilson <chris@chris-wilson.co.uk> Reviewed-by: Chris Wilson <chris@chris-wilson.co.uk> Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk> Link: https://patchwork.freedesktop.org/patch/msgid/20180319095348.9716-12-michal.winiarski@intel.com
-rw-r--r--drivers/gpu/drm/i915/intel_guc.c7
-rw-r--r--drivers/gpu/drm/i915/intel_guc_submission.c4
2 files changed, 6 insertions, 5 deletions
diff --git a/drivers/gpu/drm/i915/intel_guc.c b/drivers/gpu/drm/i915/intel_guc.c
index dc16392c4c3a..ee5230cc722e 100644
--- a/drivers/gpu/drm/i915/intel_guc.c
+++ b/drivers/gpu/drm/i915/intel_guc.c
@@ -362,9 +362,10 @@ int intel_guc_send_mmio(struct intel_guc *guc, const u32 *action, u32 len)
362 if (ret != -ETIMEDOUT) 362 if (ret != -ETIMEDOUT)
363 ret = -EIO; 363 ret = -EIO;
364 364
365 DRM_WARN("INTEL_GUC_SEND: Action 0x%X failed;" 365 DRM_DEBUG_DRIVER("INTEL_GUC_SEND: Action 0x%X failed;"
366 " ret=%d status=0x%08X response=0x%08X\n", 366 " ret=%d status=0x%08X response=0x%08X\n",
367 action[0], ret, status, I915_READ(SOFT_SCRATCH(15))); 367 action[0], ret, status,
368 I915_READ(SOFT_SCRATCH(15)));
368 } 369 }
369 370
370 intel_uncore_forcewake_put(dev_priv, guc->send_regs.fw_domains); 371 intel_uncore_forcewake_put(dev_priv, guc->send_regs.fw_domains);
diff --git a/drivers/gpu/drm/i915/intel_guc_submission.c b/drivers/gpu/drm/i915/intel_guc_submission.c
index 33af2930fc79..207cda062626 100644
--- a/drivers/gpu/drm/i915/intel_guc_submission.c
+++ b/drivers/gpu/drm/i915/intel_guc_submission.c
@@ -231,8 +231,8 @@ static int create_doorbell(struct intel_guc_client *client)
231 if (ret) { 231 if (ret) {
232 __destroy_doorbell(client); 232 __destroy_doorbell(client);
233 __update_doorbell_desc(client, GUC_DOORBELL_INVALID); 233 __update_doorbell_desc(client, GUC_DOORBELL_INVALID);
234 DRM_ERROR("Couldn't create client %u doorbell: %d\n", 234 DRM_DEBUG_DRIVER("Couldn't create client %u doorbell: %d\n",
235 client->stage_id, ret); 235 client->stage_id, ret);
236 return ret; 236 return ret;
237 } 237 }
238 238