[Intel-xe] [PATCH v2 04/17] drm/xe: Rename RC0/RC6 macros

[Matt Roper]

On Fri, Apr 21, 2023 at 03:32:45PM -0700, Lucas De Marchi wrote:
> Follow up commits will mass-remove the gen prefix/suffix. For GEN6_RC0
> and GEN6_RC6 that would make the variable too short and easy to
> conflict. So, add "GT_" prefix that is also part of the register name.
> 
> Signed-off-by: Lucas De Marchi <lucas.demarchi at intel.com>

Reviewed-by: Matt Roper <matthew.d.roper at intel.com>

> ---
>  drivers/gpu/drm/xe/regs/xe_gt_regs.h | 4 ++--
>  drivers/gpu/drm/xe/xe_guc_pc.c       | 4 ++--
>  2 files changed, 4 insertions(+), 4 deletions(-)
> 
> diff --git a/drivers/gpu/drm/xe/regs/xe_gt_regs.h b/drivers/gpu/drm/xe/regs/xe_gt_regs.h
> index f174758d8307..778d34afae93 100644
> --- a/drivers/gpu/drm/xe/regs/xe_gt_regs.h
> +++ b/drivers/gpu/drm/xe/regs/xe_gt_regs.h
> @@ -345,8 +345,8 @@
>  
>  #define GEN6_GT_CORE_STATUS			_MMIO(0x138060)
>  #define   RCN_MASK				REG_GENMASK(2, 0)
> -#define   GEN6_RC0				0
> -#define   GEN6_RC6				3
> +#define   GT_RC0				0
> +#define   GT_RC6				3
>  
>  #define GEN6_GT_GFX_RC6_LOCKED			_MMIO(0x138104)
>  #define GEN6_GT_GFX_RC6				_MMIO(0x138108)
> diff --git a/drivers/gpu/drm/xe/xe_guc_pc.c b/drivers/gpu/drm/xe/xe_guc_pc.c
> index 5a8d827ba770..2f98544736ae 100644
> --- a/drivers/gpu/drm/xe/xe_guc_pc.c
> +++ b/drivers/gpu/drm/xe/xe_guc_pc.c
> @@ -592,9 +592,9 @@ static ssize_t rc_status_show(struct device *dev,
>  	xe_device_mem_access_put(gt_to_xe(gt));
>  
>  	switch (REG_FIELD_GET(RCN_MASK, reg)) {
> -	case GEN6_RC6:
> +	case GT_RC6:
>  		return sysfs_emit(buff, "rc6\n");
> -	case GEN6_RC0:
> +	case GT_RC0:
>  		return sysfs_emit(buff, "rc0\n");
>  	default:
>  		return -ENOENT;
> -- 
> 2.39.0
> 

-- 
Matt Roper
Graphics Software Engineer
Linux GPU Platform Enablement
Intel Corporation