Re: [Intel-xe] [PATCH] drm/xe: Move Media GuC register definition to proper header

[Matt Atwood <matthew.s.atwood@intel.com>]

On Thu, May 11, 2023 at 09:20:15PM +0200, Michal Wajdeczko wrote:
> All register definitions shall be kept in dedicated regs.h files,
> not defined locally in .c files. While at it, rename it to match
> name from the Bspec.
> 
Bspec: 63363
Reviewed-by: Matt Atwood <matthew.s.atwood@intel.com>
> Signed-off-by: Michal Wajdeczko <michal.wajdeczko@intel.com>
> ---
>  drivers/gpu/drm/xe/regs/xe_guc_regs.h | 2 ++
>  drivers/gpu/drm/xe/xe_guc.c           | 4 +---
>  2 files changed, 3 insertions(+), 3 deletions(-)
> 
> diff --git a/drivers/gpu/drm/xe/regs/xe_guc_regs.h b/drivers/gpu/drm/xe/regs/xe_guc_regs.h
> index 37e0ac550931..01a8b0679679 100644
> --- a/drivers/gpu/drm/xe/regs/xe_guc_regs.h
> +++ b/drivers/gpu/drm/xe/regs/xe_guc_regs.h
> @@ -122,6 +122,8 @@ struct guc_doorbell_info {
>  #define MED_VF_SW_FLAG(n)			XE_REG(0x190310 + (n) * 4)
>  #define MED_VF_SW_FLAG_COUNT			4
>  
> +#define MED_GUC_HOST_INTERRUPT			XE_REG(0x190304)
> +
>  /* GuC Interrupt Vector */
>  #define GUC_INTR_GUC2HOST			BIT(15)
>  #define GUC_INTR_EXEC_ERROR			BIT(14)
> diff --git a/drivers/gpu/drm/xe/xe_guc.c b/drivers/gpu/drm/xe/xe_guc.c
> index eb4af4c71124..18bce8c1fbf7 100644
> --- a/drivers/gpu/drm/xe/xe_guc.c
> +++ b/drivers/gpu/drm/xe/xe_guc.c
> @@ -22,8 +22,6 @@
>  #include "xe_uc_fw.h"
>  #include "xe_wopcm.h"
>  
> -#define MEDIA_GUC_HOST_INTERRUPT        XE_REG(0x190304)
> -
>  static struct xe_gt *
>  guc_to_gt(struct xe_guc *guc)
>  {
> @@ -268,7 +266,7 @@ int xe_guc_init(struct xe_guc *guc)
>  	guc_init_params(guc);
>  
>  	if (xe_gt_is_media_type(gt))
> -		guc->notify_reg = MEDIA_GUC_HOST_INTERRUPT;
> +		guc->notify_reg = MED_GUC_HOST_INTERRUPT;
>  	else
>  		guc->notify_reg = GUC_HOST_INTERRUPT;
>  
> -- 
> 2.25.1
>