drm/i915: Move GMD_ID and mask to intel_gt header

GMD_ID* is relevant only for GT, hence moving the same
together in gt/intel_gt_regs.h

Signed-off-by: Uma Shankar <uma.shankar@intel.com>
Reviewed-by: Jani Nikula <jani.nikula@intel.com>
Link: https://patch.msgid.link/20260205094341.1882816-8-uma.shankar@intel.com

diff --git a/drivers/gpu/drm/i915/gt/intel_gt_regs.h b/drivers/gpu/drm/i915/gt/intel_gt_regs.h
index 7421ed18d8d1daf389bdb3545551e67acb635ef5..14d31882e9e77c812d60a0ae8dc6cab64d02476c 100644 (file)
--- a/drivers/gpu/drm/i915/gt/intel_gt_regs.h
+++ b/drivers/gpu/drm/i915/gt/intel_gt_regs.h
@@ -61,6 +61,9 @@
 
 #define GMD_ID_GRAPHICS                                _MMIO(0xd8c)
 #define GMD_ID_MEDIA                           _MMIO(MTL_MEDIA_GSI_BASE + 0xd8c)
+#define   GMD_ID_ARCH_MASK                     REG_GENMASK(31, 22)
+#define   GMD_ID_RELEASE_MASK                  REG_GENMASK(21, 14)
+#define   GMD_ID_STEP                          REG_GENMASK(5, 0)
 
 #define MCFG_MCR_SELECTOR                      _MMIO(0xfd0)
 #define MTL_STEER_SEMAPHORE                    _MMIO(0xfd0)

diff --git a/drivers/gpu/drm/i915/i915_reg.h b/drivers/gpu/drm/i915/i915_reg.h
index 90a5c60e76677315f1a78528809dc2a2a9934b24..b12c6bf68a2c9bb08492c4e8e9aa138748ae43b6 100644 (file)
--- a/drivers/gpu/drm/i915/i915_reg.h
+++ b/drivers/gpu/drm/i915/i915_reg.h
@@ -922,10 +922,6 @@
 #define   MASK_WAKEMEM                         REG_BIT(13)
 #define   DDI_CLOCK_REG_ACCESS                 REG_BIT(7)
 
-#define   GMD_ID_ARCH_MASK                     REG_GENMASK(31, 22)
-#define   GMD_ID_RELEASE_MASK                  REG_GENMASK(21, 14)
-#define   GMD_ID_STEP                          REG_GENMASK(5, 0)
-
 /* PCH */
 
 #define SDEISR  _MMIO(0xc4000)