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 <michal.wajdeczko@intel.com>
Reviewed-by: Matt Atwood <matthew.s.atwood@intel.com> #v1
Cc: Lucas De Marchi <lucas.demarchi@intel.com>
Reviewed-by: Lucas De Marchi <lucas.demarchi@intel.com>
Signed-off-by: Rodrigo Vivi <rodrigo.vivi@intel.com>

diff --git a/drivers/gpu/drm/xe/regs/xe_guc_regs.h b/drivers/gpu/drm/xe/regs/xe_guc_regs.h
index 37e0ac5509317e9e6cda82bf041a4de3a9278f59..b4f27cadb68f53065d341ec16812e361ac79c9f6 100644 (file)
--- 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 b72407e24d0978bcb25b6162a90208cd16d53a46..92d732690252679ea91fffcd4c8b799c5d83d774 100644 (file)
--- 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;