From 5013ad8dd75fdc035ff068980c91cf2ea821d142 Mon Sep 17 00:00:00 2001 From: Michal Wajdeczko Date: Thu, 11 May 2023 20:19:09 +0200 Subject: [PATCH] drm/xe: Move Media GuC register definition to regs/ This GuC register can be moved together with the rest of the GuC register definitions and be named in a similar way. v2: fix placement Bspec: 63363 Signed-off-by: Michal Wajdeczko Reviewed-by: Matt Atwood #v1 Cc: Lucas De Marchi Reviewed-by: Lucas De Marchi Signed-off-by: Rodrigo Vivi --- 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..b4f27cadb68f 100644 --- a/drivers/gpu/drm/xe/regs/xe_guc_regs.h +++ b/drivers/gpu/drm/xe/regs/xe_guc_regs.h @@ -119,6 +119,8 @@ struct guc_doorbell_info { #define VF_SW_FLAG(n) XE_REG(0x190240 + (n) * 4) #define VF_SW_FLAG_COUNT 4 +#define MED_GUC_HOST_INTERRUPT XE_REG(0x190304) + #define MED_VF_SW_FLAG(n) XE_REG(0x190310 + (n) * 4) #define MED_VF_SW_FLAG_COUNT 4 diff --git a/drivers/gpu/drm/xe/xe_guc.c b/drivers/gpu/drm/xe/xe_guc.c index b72407e24d09..92d732690252 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;