diff options
| author | Lucas De Marchi <lucas.demarchi@intel.com> | 2023-04-13 02:28:44 +0300 |
|---|---|---|
| committer | Rodrigo Vivi <rodrigo.vivi@intel.com> | 2023-12-20 02:31:43 +0300 |
| commit | bb36f4b4ed279c7deed936957f733b2af0d3d78f (patch) | |
| tree | 3b54b11e835572ef190b82274e57aef625d068a3 | |
| parent | 58e19acf0cdf3f18c1c868165f45d3ea626b9c3f (diff) | |
| download | linux-bb36f4b4ed279c7deed936957f733b2af0d3d78f.tar.xz | |
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>
| -rw-r--r-- | drivers/gpu/drm/xe/regs/xe_gt_regs.h | 4 | ||||
| -rw-r--r-- | drivers/gpu/drm/xe/xe_guc_pc.c | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/drivers/gpu/drm/xe/regs/xe_gt_regs.h b/drivers/gpu/drm/xe/regs/xe_gt_regs.h index c1d73f3e7bc3..fb91f04c3c6c 100644 --- 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 b853831b342b..0b6d0577a8a7 100644 --- 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; |