[v2,4/5] drm/i915/guc: Switch to CT_ERROR in ct_read
diff mbox series

Message ID 20200117082039.65644-5-michal.wajdeczko@intel.com
State New
Headers show
Series
  • Misc GuC CT improvements - part II
Related show

Commit Message

Michal Wajdeczko Jan. 17, 2020, 8:20 a.m. UTC
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>
---
 drivers/gpu/drm/i915/gt/uc/intel_guc_ct.c | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

Comments

Piotr Piórkowski Jan. 17, 2020, 9:51 a.m. UTC | #1
Michal Wajdeczko <michal.wajdeczko@intel.com> 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@intel.com>
> Cc: Chris Wilson <chris@chris-wilson.co.uk>
> Cc: Daniele Ceraolo Spurio <daniele.ceraolospurio@intel.com>
> ---
>  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@intel.com>

> -- 
> 2.19.2
> 
> _______________________________________________
> Intel-gfx mailing list
> Intel-gfx@lists.freedesktop.org
> https://lists.freedesktop.org/mailman/listinfo/intel-gfx

Patch
diff mbox series

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;
 }