Re: [PATCH 3/7] drm/xe: Prepare format for GT-oriented messages in one place

[Rodrigo Vivi <rodrigo.vivi@intel.com>]

On Wed, Sep 03, 2025 at 11:36:08PM +0200, Michal Wajdeczko wrote:
> To avoid code duplication (and thus potential mistakes) and to
> allow easier changes (if needed) of the prefix format of the
> GT-oriented messages, prepare that prefix in dedicated macro.
> 
> Signed-off-by: Michal Wajdeczko <michal.wajdeczko@intel.com>
> ---
>  drivers/gpu/drm/xe/xe_gt_printk.h | 13 +++++++++----
>  1 file changed, 9 insertions(+), 4 deletions(-)
> 
> diff --git a/drivers/gpu/drm/xe/xe_gt_printk.h b/drivers/gpu/drm/xe/xe_gt_printk.h
> index f2091c734aba..5aaacaa6780c 100644
> --- a/drivers/gpu/drm/xe/xe_gt_printk.h
> +++ b/drivers/gpu/drm/xe/xe_gt_printk.h
> @@ -10,8 +10,10 @@
>  
>  #include "xe_gt_types.h"
>  
> +#define __xe_gt_printk_fmt(_gt, _fmt, _args...)	"GT%u: " _fmt, (_gt)->info.id, ##_args
> +
>  #define xe_gt_printk(_gt, _level, _fmt, ...) \
> -	drm_##_level(&gt_to_xe(_gt)->drm, "GT%u: " _fmt, (_gt)->info.id, ##__VA_ARGS__)
> +	drm_##_level(&gt_to_xe(_gt)->drm, __xe_gt_printk_fmt((_gt), _fmt, ##__VA_ARGS__))

I honestly hate macros, and macros over macros makes things worse imho.
Specially with this format that looks like a function call inside an argument area.

But I do understand the motivations of the macro and the reasoning exposed above.
So, no hard blocker from my side...

Perhaps if we at least use all CAPS XE_GT_PRINTK_FMT?!

>  
>  #define xe_gt_err(_gt, _fmt, ...) \
>  	xe_gt_printk((_gt), err, _fmt, ##__VA_ARGS__)
> @@ -34,11 +36,14 @@
>  #define xe_gt_dbg(_gt, _fmt, ...) \
>  	xe_gt_printk((_gt), dbg, _fmt, ##__VA_ARGS__)
>  
> +#define xe_gt_WARN_type(_gt, _type, _condition, _fmt, ...) \
> +	drm_WARN##_type(&gt_to_xe(_gt)->drm, _condition, _fmt, ## __VA_ARGS__)
> +
>  #define xe_gt_WARN(_gt, _condition, _fmt, ...) \
> -	drm_WARN(&gt_to_xe(_gt)->drm, _condition, "GT%u: " _fmt, (_gt)->info.id, ##__VA_ARGS__)
> +	xe_gt_WARN_type((_gt),, _condition, __xe_gt_printk_fmt((_gt), _fmt, ##__VA_ARGS__))
>  
>  #define xe_gt_WARN_ONCE(_gt, _condition, _fmt, ...) \
> -	drm_WARN_ONCE(&gt_to_xe(_gt)->drm, _condition, "GT%u: " _fmt, (_gt)->info.id, ##__VA_ARGS__)
> +	xe_gt_WARN_type((_gt), _ONCE, _condition, __xe_gt_printk_fmt((_gt), _fmt, ##__VA_ARGS__))
>  
>  #define xe_gt_WARN_ON(_gt, _condition) \
>  	xe_gt_WARN((_gt), _condition, "%s(%s)", "WARN_ON", __stringify(_condition))
> @@ -72,7 +77,7 @@ static inline void __xe_gt_printfn_dbg(struct drm_printer *p, struct va_format *
>  	dbg = drm_dbg_printer(&gt_to_xe(gt)->drm, DRM_UT_DRIVER, NULL);
>  	dbg.origin = p->origin;
>  
> -	drm_printf(&dbg, "GT%u: %pV", gt->info.id, vaf);
> +	drm_printf(&dbg, __xe_gt_printk_fmt(gt, "%pV", vaf));
>  }
>  
>  /**
> -- 
> 2.47.1
>