drm/xe: Rename RC0/RC6 macros

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@intel.com>
Reviewed-by: Matt Roper <matthew.d.roper@intel.com>
Signed-off-by: Rodrigo Vivi <rodrigo.vivi@intel.com>

diff --git a/drivers/gpu/drm/xe/regs/xe_gt_regs.h b/drivers/gpu/drm/xe/regs/xe_gt_regs.h
index c1d73f3e7bc35ef389f16b24b2e6929ae8a103a8..fb91f04c3c6cf7ffd1408045875baca4c5c2c3f4 100644 (file)
--- 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 b853831b342b3e686d0dac4d783b5e6c928836d0..0b6d0577a8a7b336dfed66aa1cffa69a1474cd29 100644 (file)
--- 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;