diff options
author | Badal Nilawar <badal.nilawar@intel.com> | 2023-06-23 10:54:31 +0530 |
---|---|---|
committer | Rodrigo Vivi <rodrigo.vivi@intel.com> | 2023-12-21 11:35:02 -0500 |
commit | 7b076d14f21a48de572e5191614b3e6b2d6ab823 (patch) | |
tree | d811a9a226e59dbe836517565948d172a7914628 | |
parent | 1c2097bbde107effe2183891f92c060aa64bfa8b (diff) |
drm/xe/mtl: Add support to get C6 residency/status of MTL
Add the registers to get C6 residency of MTL SAMedia and
C6 status of MTL gts
v2:
- move register definitions to regs header (Anshuman)
- correct reg definition for mtl rc status
- make idle_status function common (Badal)
v3:
- remove extra line in commit message
- use only media type check in initialization
- use graphics ver check (Anshuman)
v4:
- remove extra lines (Anshuman)
Bspec: 66300
Signed-off-by: Badal Nilawar <badal.nilawar@intel.com>
Signed-off-by: Riana Tauro <riana.tauro@intel.com>
Reviewed-by: Andi Shyti <andi.shyti@linux.intel.com>
Reviewed-by: Anshuman Gupta <anshuman.gupta@intel.com>
Signed-off-by: Rodrigo Vivi <rodrigo.vivi@intel.com>
-rw-r--r-- | drivers/gpu/drm/xe/regs/xe_gt_regs.h | 11 | ||||
-rw-r--r-- | drivers/gpu/drm/xe/xe_gt_idle_sysfs.c | 14 | ||||
-rw-r--r-- | drivers/gpu/drm/xe/xe_guc_pc.c | 41 | ||||
-rw-r--r-- | drivers/gpu/drm/xe/xe_guc_pc.h | 3 |
4 files changed, 52 insertions, 17 deletions
diff --git a/drivers/gpu/drm/xe/regs/xe_gt_regs.h b/drivers/gpu/drm/xe/regs/xe_gt_regs.h index d2a0a5c8b02a..55b0f70e1904 100644 --- a/drivers/gpu/drm/xe/regs/xe_gt_regs.h +++ b/drivers/gpu/drm/xe/regs/xe_gt_regs.h @@ -16,6 +16,11 @@ #define MEDIA_GT_GSI_OFFSET 0x380000 #define MEDIA_GT_GSI_LENGTH 0x40000 +/* MTL workpoint reg to get core C state and actual freq of 3D, SAMedia */ +#define MTL_MIRROR_TARGET_WP1 XE_REG(0xc60) +#define MTL_CAGF_MASK REG_GENMASK(8, 0) +#define MTL_CC_MASK REG_GENMASK(12, 9) + /* RPM unit config (Gen8+) */ #define RPM_CONFIG0 XE_REG(0xd00) #define RPM_CONFIG0_CRYSTAL_CLOCK_FREQ_MASK REG_GENMASK(5, 3) @@ -349,10 +354,12 @@ #define FORCEWAKE_USER BIT(1) #define FORCEWAKE_KERNEL_FALLBACK BIT(15) +#define MTL_MEDIA_MC6 XE_REG(0x138048) + #define GT_CORE_STATUS XE_REG(0x138060) #define RCN_MASK REG_GENMASK(2, 0) -#define GT_RC0 0 -#define GT_RC6 3 +#define GT_C0 0 +#define GT_C6 3 #define GT_GFX_RC6_LOCKED XE_REG(0x138104) #define GT_GFX_RC6 XE_REG(0x138108) diff --git a/drivers/gpu/drm/xe/xe_gt_idle_sysfs.c b/drivers/gpu/drm/xe/xe_gt_idle_sysfs.c index ec77349dea76..7238e96a116c 100644 --- a/drivers/gpu/drm/xe/xe_gt_idle_sysfs.c +++ b/drivers/gpu/drm/xe/xe_gt_idle_sysfs.c @@ -142,11 +142,17 @@ void xe_gt_idle_sysfs_init(struct xe_gt_idle *gtidle) return; } - sprintf(gtidle->name, "gt%d-rc\n", gt->info.id); - /* Multiplier for RC6 Residency counter in units of 1.28us */ + if (xe_gt_is_media_type(gt)) { + sprintf(gtidle->name, "gt%d-mc\n", gt->info.id); + gtidle->idle_residency = xe_guc_pc_mc6_residency; + } else { + sprintf(gtidle->name, "gt%d-rc\n", gt->info.id); + gtidle->idle_residency = xe_guc_pc_rc6_residency; + } + + /* Multiplier for Residency counter in units of 1.28us */ gtidle->residency_multiplier = 1280; - gtidle->idle_residency = xe_guc_pc_rc6_residency; - gtidle->idle_status = xe_guc_pc_rc_status; + gtidle->idle_status = xe_guc_pc_c_status; err = sysfs_create_files(kobj, gt_idle_attrs); if (err) { diff --git a/drivers/gpu/drm/xe/xe_guc_pc.c b/drivers/gpu/drm/xe/xe_guc_pc.c index f02bf1641380..3093cfeff0c2 100644 --- a/drivers/gpu/drm/xe/xe_guc_pc.c +++ b/drivers/gpu/drm/xe/xe_guc_pc.c @@ -34,9 +34,6 @@ #define GT_PERF_STATUS XE_REG(0x1381b4) #define GEN12_CAGF_MASK REG_GENMASK(19, 11) -#define MTL_MIRROR_TARGET_WP1 XE_REG(0xc60) -#define MTL_CAGF_MASK REG_GENMASK(8, 0) - #define GT_FREQUENCY_MULTIPLIER 50 #define GEN9_FREQ_SCALER 3 @@ -568,22 +565,30 @@ out: static DEVICE_ATTR_RW(freq_max); /** - * xe_guc_pc_rc_status - get the current Render C state + * xe_guc_pc_c_status - get the current GT C state * @pc: XE_GuC_PC instance */ -enum xe_gt_idle_state xe_guc_pc_rc_status(struct xe_guc_pc *pc) +enum xe_gt_idle_state xe_guc_pc_c_status(struct xe_guc_pc *pc) { struct xe_gt *gt = pc_to_gt(pc); - u32 reg; + u32 reg, gt_c_state; xe_device_mem_access_get(gt_to_xe(gt)); - reg = xe_mmio_read32(gt, GT_CORE_STATUS); + + if (GRAPHICS_VERx100(gt_to_xe(gt)) >= 1270) { + reg = xe_mmio_read32(gt, MTL_MIRROR_TARGET_WP1); + gt_c_state = REG_FIELD_GET(MTL_CC_MASK, reg); + } else { + reg = xe_mmio_read32(gt, GT_CORE_STATUS); + gt_c_state = REG_FIELD_GET(RCN_MASK, reg); + } + xe_device_mem_access_put(gt_to_xe(gt)); - switch (REG_FIELD_GET(RCN_MASK, reg)) { - case GT_RC6: + switch (gt_c_state) { + case GT_C6: return GT_IDLE_C6; - case GT_RC0: + case GT_C0: return GT_IDLE_C0; default: return GT_IDLE_UNKNOWN; @@ -606,6 +611,22 @@ u64 xe_guc_pc_rc6_residency(struct xe_guc_pc *pc) return reg; } +/** + * xe_guc_pc_mc6_residency - mc6 residency counter + * @pc: Xe_GuC_PC instance + */ +u64 xe_guc_pc_mc6_residency(struct xe_guc_pc *pc) +{ + struct xe_gt *gt = pc_to_gt(pc); + u64 reg; + + xe_device_mem_access_get(gt_to_xe(gt)); + reg = xe_mmio_read32(gt, MTL_MEDIA_MC6); + xe_device_mem_access_put(gt_to_xe(gt)); + + return reg; +} + static const struct attribute *pc_attrs[] = { &dev_attr_freq_act.attr, &dev_attr_freq_cur.attr, diff --git a/drivers/gpu/drm/xe/xe_guc_pc.h b/drivers/gpu/drm/xe/xe_guc_pc.h index 976179dbc9a8..370353a40a17 100644 --- a/drivers/gpu/drm/xe/xe_guc_pc.h +++ b/drivers/gpu/drm/xe/xe_guc_pc.h @@ -12,6 +12,7 @@ int xe_guc_pc_init(struct xe_guc_pc *pc); int xe_guc_pc_start(struct xe_guc_pc *pc); int xe_guc_pc_stop(struct xe_guc_pc *pc); -enum xe_gt_idle_state xe_guc_pc_rc_status(struct xe_guc_pc *pc); +enum xe_gt_idle_state xe_guc_pc_c_status(struct xe_guc_pc *pc); u64 xe_guc_pc_rc6_residency(struct xe_guc_pc *pc); +u64 xe_guc_pc_mc6_residency(struct xe_guc_pc *pc); #endif /* _XE_GUC_PC_H_ */ |