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

diff --git a/drivers/gpu/drm/i915/intel_guc.c b/drivers/gpu/drm/i915/intel_guc.c
index dc16392c4c3a3e97ad935b392a44b5062e176590..ee5230cc722e1f2ef93ff8a5a138c124a0438706 100644 (file)
--- 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)
                if (ret != -ETIMEDOUT)
                        ret = -EIO;
 
-               DRM_WARN("INTEL_GUC_SEND: Action 0x%X failed;"
-                        " ret=%d status=0x%08X response=0x%08X\n",
-                        action[0], ret, status, I915_READ(SOFT_SCRATCH(15)));
+               DRM_DEBUG_DRIVER("INTEL_GUC_SEND: Action 0x%X failed;"
+                                " ret=%d status=0x%08X response=0x%08X\n",
+                                action[0], ret, status,
+                                I915_READ(SOFT_SCRATCH(15)));
        }
 
        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 33af2930fc79f72f9919e4dcf3d46117200e2411..207cda0626268769d00fa38e21951132a1f57b76 100644 (file)
--- 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)
        if (ret) {
                __destroy_doorbell(client);
                __update_doorbell_desc(client, GUC_DOORBELL_INVALID);
-               DRM_ERROR("Couldn't create client %u doorbell: %d\n",
-                         client->stage_id, ret);
+               DRM_DEBUG_DRIVER("Couldn't create client %u doorbell: %d\n",
+                                client->stage_id, ret);
                return ret;
        }