Michal Wajdeczko <michal.wajdeczko@xxxxxxxxx> wrote on pią [2020-sty-17 08:20:38 +0000]:
> 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@xxxxxxxxx>
> Cc: Chris Wilson <chris@xxxxxxxxxxxxxxxxxx>
> Cc: Daniele Ceraolo Spurio <daniele.ceraolospurio@xxxxxxxxx>
> ---
> drivers/gpu/drm/i915/gt/uc/intel_guc_ct.c | 16 ++++++++--------
> 1 file changed, 8 insertions(+), 8 deletions(-)
>
> 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 b84b6ec37b8d..09467728bc9b 100644
> --- a/drivers/gpu/drm/i915/gt/uc/intel_guc_ct.c
> +++ b/drivers/gpu/drm/i915/gt/uc/intel_guc_ct.c
> @@ -620,12 +620,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;
> }
>
> @@ -639,8 +639,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;
> }
LGTM
Reviewed-by: Piotr Piórkowski <piotr.piorkowski@xxxxxxxxx>
> --
> 2.19.2
>
> _______________________________________________
> Intel-gfx mailing list
> Intel-gfx@xxxxxxxxxxxxxxxxxxxxx
> https://lists.freedesktop.org/mailman/listinfo/intel-gfx
_______________________________________________
Intel-gfx mailing list
Intel-gfx@xxxxxxxxxxxxxxxxxxxxx
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
