drm/i915/guc: Switch to CT_ERROR in ct_read

As we now have "ct" available in ct_read function we can switch
from generic DRM_ERROR to our custom CT_ERROR.

Signed-off-by: Michal Wajdeczko <michal.wajdeczko@intel.com>
Cc: Chris Wilson <chris@chris-wilson.co.uk>
Cc: Daniele Ceraolo Spurio <daniele.ceraolospurio@intel.com>
Reviewed-by: Piotr Piórkowski <piotr.piorkowski@intel.com>
Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
Link: https://patchwork.freedesktop.org/patch/msgid/20200117082039.65644-5-michal.wajdeczko@intel.com

diff --git a/drivers/gpu/drm/i915/gt/uc/intel_guc_ct.c b/drivers/gpu/drm/i915/gt/uc/intel_guc_ct.c
index a381fd07668a7e91939693a4747526ae2fbb2881..a0aa79b3a876447fcdffb37fdbf02b8a6e5e094f 100644 (file)
--- a/drivers/gpu/drm/i915/gt/uc/intel_guc_ct.c
+++ b/drivers/gpu/drm/i915/gt/uc/intel_guc_ct.c
@@ -617,12 +617,12 @@ static int ct_read(struct intel_guc_ct *ct, u32 *data)
        /* message len with header */
        len = ct_header_get_len(data[0]) + 1;
        if (unlikely(len > (u32)available)) {
-               DRM_ERROR("CT: incomplete message %*ph %*ph %*ph\n",
-                         4, data,
-                         4 * (head + available - 1 > size ?
-                              size - head : available - 1), &cmds[head],
-                         4 * (head + available - 1 > size ?
-                              available - 1 - size + head : 0), &cmds[0]);
+               CT_ERROR(ct, "Incomplete message %*ph %*ph %*ph\n",
+                        4, data,
+                        4 * (head + available - 1 > size ?
+                             size - head : available - 1), &cmds[head],
+                        4 * (head + available - 1 > size ?
+                             available - 1 - size + head : 0), &cmds[0]);
                goto corrupted;
        }
 
@@ -636,8 +636,8 @@ static int ct_read(struct intel_guc_ct *ct, u32 *data)
        return 0;
 
 corrupted:
-       DRM_ERROR("CT: Corrupted descriptor addr=%#x head=%u tail=%u size=%u\n",
-                 desc->addr, desc->head, desc->tail, desc->size);
+       CT_ERROR(ct, "Corrupted descriptor addr=%#x head=%u tail=%u size=%u\n",
+                desc->addr, desc->head, desc->tail, desc->size);
        desc->is_in_error = 1;
        return -EPIPE;
 }