i915: CAGF and RC6 changes for MTL
Subsystems (2)
cover i915: CAGF and RC6 changes for MTL
This series includes the code changes to get CAGF, RC State and C6 Residency of MTL.
v3: Included "Use GEN12 RPSTAT register" patch
v4:
- Rebased
- Dropped "Use GEN12 RPSTAT register" patch from this series going to send separate series for it
v5:
- Included "drm/i915/gt: Change RC6 residency functions to accept register ID's" based on code review feedback
v6:
- Addressed Jani N's review comments on "drm/i915/gt: Change RC6 residency functions to accept register ID's"
- Re-add "drm/i915: Use GEN12_RPSTAT register for GT freq" to this series
v7: Rebuild, identical to v6
v8:
- Add "drm/i915/rps: Prefer REG_FIELD_GET in intel_rps_get_cagf" to the series (based on Rodrigo's review) to consistently use REG_FIELD_GET
- Minor changes to other patches, please see individual patches for changelogs
v9: Rebuild, identical to v8
v10: Address review comments from Rodrigo on Patch 5
Ashutosh Dixit (2):
drm/i915/rps: Prefer REG_FIELD_GET in intel_rps_get_cagf drm/i915/gt: Use RC6 residency types as arguments to residency
functions
Badal Nilawar (2):
drm/i915/mtl: Modify CAGF functions for MTL drm/i915/mtl: C6 residency and C state type for MTL SAMedia
Don Hiatt (1):
drm/i915: Use GEN12_RPSTAT register for GT freq
drivers/gpu/drm/i915/gt/intel_gt_pm_debugfs.c | 88 ++++++++++++++----- drivers/gpu/drm/i915/gt/intel_gt_regs.h | 22 +++-- drivers/gpu/drm/i915/gt/intel_gt_sysfs_pm.c | 12 +-- drivers/gpu/drm/i915/gt/intel_rc6.c | 64 +++++++++----- drivers/gpu/drm/i915/gt/intel_rc6.h | 11 ++- drivers/gpu/drm/i915/gt/intel_rc6_types.h | 15 +++- drivers/gpu/drm/i915/gt/intel_rps.c | 51 ++++++++--- drivers/gpu/drm/i915/gt/intel_rps.h | 2 + drivers/gpu/drm/i915/gt/selftest_rc6.c | 6 +- drivers/gpu/drm/i915/i915_pmu.c | 9 +- 10 files changed, 198 insertions(+), 82 deletions(-)
Signature · 1 line
2.38.0
PATCH 1/5 drm/i915/rps: Prefer REG_FIELD_GET in intel_rps_get_cagf
Instead of masks/shifts settle on REG_FIELD_GET as the standard way to extract reg fields. This allows future patches touching this code to also consistently use REG_FIELD_GET and friends.
--- drivers/gpu/drm/i915/gt/intel_gt_pm_debugfs.c | 2 +- drivers/gpu/drm/i915/gt/intel_gt_regs.h | 12 ++++-------- drivers/gpu/drm/i915/gt/intel_rps.c | 11 +++++------ 3 files changed, 10 insertions(+), 15 deletions(-)
drivers/gpu/drm/i915/gt/intel_gt_pm_debugfs.c +1 -1
@@ -307,7 +307,7 @@ void intel_gt_pm_frequency_dump(struct intel_gt *gt, struct drm_printer *p)drm_printf (p,"Current VID: %d\n" , (rgvstat &MEMSTAT_VID_MASK ) >>MEMSTAT_VID_SHIFT );drm_printf (p,"Current P-state: %d\n" , - (rgvstat &MEMSTAT_PSTATE_MASK ) >>MEMSTAT_PSTATE_SHIFT ); +REG_FIELD_GET (MEMSTAT_PSTATE_MASK , rgvstat)); }else if (IS_VALLEYVIEW (i915) ||IS_CHERRYVIEW (i915)) {u32 rpmodectl, freq_sts;
drivers/gpu/drm/i915/gt/intel_gt_regs.h +4 -8
@@ -794,12 +794,9 @@#define GEN6_RP_DOWN_TIMEOUT _MMIO(0xa010)#define GEN6_RP_INTERRUPT_LIMITS _MMIO(0xa014)#define GEN6_RPSTAT1 _MMIO(0xa01c) -#define GEN6_CAGF_SHIFT 8 -#define HSW_CAGF_SHIFT 7 -#define GEN9_CAGF_SHIFT 23 -#define GEN6_CAGF_MASK (0x7f << GEN6_CAGF_SHIFT) -#define HSW_CAGF_MASK (0x7f << HSW_CAGF_SHIFT) -#define GEN9_CAGF_MASK (0x1ff << GEN9_CAGF_SHIFT) +#define GEN6_CAGF_MASK REG_GENMASK(14, 8) +#define HSW_CAGF_MASK REG_GENMASK(13, 7) +#define GEN9_CAGF_MASK REG_GENMASK(31, 23)#define GEN6_RP_CONTROL _MMIO(0xa024)#define GEN6_RP_MEDIA_TURBO (1 << 11)#define GEN6_RP_MEDIA_MODE_MASK (3 << 9)
@@ -1370,8 +1367,7 @@#define MEMSTAT_ILK _MMIO(0x111f8)#define MEMSTAT_VID_MASK 0x7f00#define MEMSTAT_VID_SHIFT 8 -#define MEMSTAT_PSTATE_MASK 0x00f8 -#define MEMSTAT_PSTATE_SHIFT 3 +#define MEMSTAT_PSTATE_MASK REG_GENMASK(7, 3)#define MEMSTAT_MON_ACTV (1 << 2)#define MEMSTAT_SRC_CTL_MASK 0x0003#define MEMSTAT_SRC_CTL_CORE 0
drivers/gpu/drm/i915/gt/intel_rps.c +5 -6
@@ -2072,16 +2072,15 @@ u32 intel_rps_get_cagf(struct intel_rps *rps, u32 rpstat)u32 cagf;if (IS_VALLEYVIEW (i915) ||IS_CHERRYVIEW (i915)) - cagf = (rpstat >>8 ) &0xff ; + cagf =REG_FIELD_GET (RPE_MASK , rpstat);else if (GRAPHICS_VER (i915) >=9 ) - cagf = (rpstat &GEN9_CAGF_MASK ) >>GEN9_CAGF_SHIFT ; + cagf =REG_FIELD_GET (GEN9_CAGF_MASK , rpstat);else if (IS_HASWELL (i915) ||IS_BROADWELL (i915)) - cagf = (rpstat &HSW_CAGF_MASK ) >>HSW_CAGF_SHIFT ; + cagf =REG_FIELD_GET (HSW_CAGF_MASK , rpstat);else if (GRAPHICS_VER (i915) >=6 ) - cagf = (rpstat &GEN6_CAGF_MASK ) >>GEN6_CAGF_SHIFT ; + cagf =REG_FIELD_GET (GEN6_CAGF_MASK , rpstat);else - cagf =gen5_invert_freq (rps, (rpstat &MEMSTAT_PSTATE_MASK ) >> -MEMSTAT_PSTATE_SHIFT ); + cagf =gen5_invert_freq (rps,REG_FIELD_GET (MEMSTAT_PSTATE_MASK , rpstat));return cagf; }
Signature · 1 line
2.38.0
PATCH 2/5 drm/i915: Use GEN12_RPSTAT register for GT freq
In reply to Ashutosh DixitFrom: Don Hiatt <[email protected]>
On GEN12+ use GEN12_RPSTAT register to get actual resolved GT freq. GEN12_RPSTAT does not require a forcewake and will return 0 freq if GT is in RC6.
v2:
- Fixed review comments(Ashutosh)
- Added function intel_rps_read_rpstat_fw to read RPSTAT without forcewake, required especially for GEN6_RPSTAT1 (Ashutosh, Tvrtko)
v3:
- Updated commit title and message for more clarity (Ashutosh)
- Replaced intel_rps_read_rpstat with direct read to GEN12_RPSTAT1 in read_cagf (Ashutosh)
v4: Remove GEN12_CAGF_SHIFT and use REG_FIELD_GET (Rodrigo)
--- drivers/gpu/drm/i915/gt/intel_gt_regs.h | 1 + drivers/gpu/drm/i915/gt/intel_rps.c | 32 +++++++++++++++++++++---- drivers/gpu/drm/i915/gt/intel_rps.h | 2 ++ drivers/gpu/drm/i915/i915_pmu.c | 3 +-- 4 files changed, 32 insertions(+), 6 deletions(-)
drivers/gpu/drm/i915/gt/intel_gt_regs.h +1 -0
@@ -1539,6 +1539,7 @@#define GEN12_RPSTAT1 _MMIO(0x1381b4)#define GEN12_VOLTAGE_MASK REG_GENMASK(10, 0) +#define GEN12_CAGF_MASK REG_GENMASK(19, 11)#define GEN11_GT_INTR_DW (x) _MMIO(0x190018 + ((x) * 4))#define GEN11_CSME (31)
drivers/gpu/drm/i915/gt/intel_rps.c +28 -4
@@ -2066,12 +2066,34 @@ void intel_rps_sanitize(struct intel_rps *rps)rps_disable_interrupts (rps); } +u32 intel_rps_read_rpstat_fw (struct intel_rps *rps) +{ +struct drm_i915_private *i915 =rps_to_i915 (rps); +i915_reg_t rpstat; + + rpstat = (GRAPHICS_VER (i915) >=12 ) ?GEN12_RPSTAT1 :GEN6_RPSTAT1 ; + +return intel_uncore_read_fw (rps_to_gt (rps)->uncore, rpstat); +} + +u32 intel_rps_read_rpstat (struct intel_rps *rps) +{ +struct drm_i915_private *i915 =rps_to_i915 (rps); +i915_reg_t rpstat; + + rpstat = (GRAPHICS_VER (i915) >=12 ) ?GEN12_RPSTAT1 :GEN6_RPSTAT1 ; + +return intel_uncore_read (rps_to_gt (rps)->uncore, rpstat); +} +u32 intel_rps_get_cagf (struct intel_rps *rps,u32 rpstat) {struct drm_i915_private *i915 =rps_to_i915 (rps);u32 cagf; -if (IS_VALLEYVIEW (i915) ||IS_CHERRYVIEW (i915)) +if (GRAPHICS_VER (i915) >=12 ) + cagf =REG_FIELD_GET (GEN12_CAGF_MASK , rpstat); +else if (IS_VALLEYVIEW (i915) ||IS_CHERRYVIEW (i915)) cagf =REG_FIELD_GET (RPE_MASK , rpstat);else if (GRAPHICS_VER (i915) >=9 ) cagf =REG_FIELD_GET (GEN9_CAGF_MASK , rpstat);
@@ -2091,7 +2113,9 @@ static u32 read_cagf(struct intel_rps *rps)struct intel_uncore *uncore =rps_to_uncore (rps);u32 freq; -if (IS_VALLEYVIEW (i915) ||IS_CHERRYVIEW (i915)) { +if (GRAPHICS_VER (i915) >=12 ) { + freq =intel_uncore_read (uncore,GEN12_RPSTAT1 ); + }else if (IS_VALLEYVIEW (i915) ||IS_CHERRYVIEW (i915)) {vlv_punit_get (i915); freq =vlv_punit_read (i915,PUNIT_REG_GPU_FREQ_STS );vlv_punit_put (i915);
@@ -2257,7 +2281,7 @@ static void rps_frequency_dump(struct intel_rps *rps, struct drm_printer *p) rpinclimit =intel_uncore_read (uncore,GEN6_RP_UP_THRESHOLD ); rpdeclimit =intel_uncore_read (uncore,GEN6_RP_DOWN_THRESHOLD ); - rpstat =intel_uncore_read (uncore,GEN6_RPSTAT1 ); + rpstat =intel_rps_read_rpstat (rps); rpcurupei =intel_uncore_read (uncore,GEN6_RP_CUR_UP_EI ) &GEN6_CURICONT_MASK ; rpcurup =intel_uncore_read (uncore,GEN6_RP_CUR_UP ) &GEN6_CURBSYTAVG_MASK ; rpprevup =intel_uncore_read (uncore,GEN6_RP_PREV_UP ) &GEN6_CURBSYTAVG_MASK ;
@@ -2392,7 +2416,7 @@ static void slpc_frequency_dump(struct intel_rps *rps, struct drm_printer *p)drm_printf (p,"PM MASK=0x%08x\n" , pm_mask);drm_printf (p,"pm_intrmsk_mbz: 0x%08x\n" , rps->pm_intrmsk_mbz); -drm_printf (p,"RPSTAT1: 0x%08x\n" ,intel_uncore_read (uncore,GEN6_RPSTAT1 )); +drm_printf (p,"RPSTAT1: 0x%08x\n" ,intel_rps_read_rpstat (rps));drm_printf (p,"RPNSWREQ: %dMHz\n" ,intel_rps_get_requested_frequency (rps));drm_printf (p,"Lowest (RPN) frequency: %dMHz\n" ,intel_gpu_freq (rps, caps.min_freq));
drivers/gpu/drm/i915/gt/intel_rps.h +2 -0
@@ -48,6 +48,8 @@ u32 intel_rps_get_rp1_frequency(struct intel_rps *rps);u32 intel_rps_get_rpn_frequency (struct intel_rps *rps);u32 intel_rps_read_punit_req (struct intel_rps *rps);u32 intel_rps_read_punit_req_frequency (struct intel_rps *rps); +u32 intel_rps_read_rpstat (struct intel_rps *rps); +u32 intel_rps_read_rpstat_fw (struct intel_rps *rps);void gen6_rps_get_freq_caps (struct intel_rps *rps,struct intel_rps_freq_caps *caps);void intel_rps_raise_unslice (struct intel_rps *rps);void intel_rps_lower_unslice (struct intel_rps *rps);
drivers/gpu/drm/i915/i915_pmu.c +1 -2
@@ -371,7 +371,6 @@ static void frequency_sample(struct intel_gt *gt, unsigned int period_ns) { struct drm_i915_private *i915 = gt->i915; -struct intel_uncore *uncore = gt->uncore;struct i915_pmu *pmu = &i915->pmu;struct intel_rps *rps = >->rps;
@@ -394,7 +393,7 @@ frequency_sample(struct intel_gt *gt, unsigned int period_ns)* case we assume the system is running at the intended * frequency. Fortunately, the read should rarely fail! */ - val =intel_uncore_read_fw (uncore,GEN6_RPSTAT1 ); + val =intel_rps_read_rpstat_fw (rps);if (val) val =intel_rps_get_cagf (rps, val);else
Signature · 1 line
2.38.0
PATCH 3/5 drm/i915/mtl: Modify CAGF functions for MTL
In reply to Ashutosh DixitFrom: Badal Nilawar <[email protected]>
Update CAGF functions for MTL to get actual resolved frequency of 3D and SAMedia.
v2: Update MTL_MIRROR_TARGET_WP1 position/formatting (MattR)
Move MTL branches in cagf functions to top (MattR)
Fix commit message (Andi)
v3: Added comment about registers not needing forcewake for Gen12+ and
returning 0 freq in RC6
v4: Use REG_FIELD_GET and uncore (Rodrigo)
Bspec: 66300
--- drivers/gpu/drm/i915/gt/intel_gt_regs.h | 4 ++++ drivers/gpu/drm/i915/gt/intel_rps.c | 12 ++++++++++-- 2 files changed, 14 insertions(+), 2 deletions(-)
drivers/gpu/drm/i915/gt/intel_gt_regs.h +4 -0
@@ -21,6 +21,10 @@*/ #define PERF_REG (offset) _MMIO(offset) +/* MTL workpoint reg to get core C state and actual freq of 3D, SAMedia */ +#define MTL_MIRROR_TARGET_WP1 _MMIO(0xc60) +#define MTL_CAGF_MASK REG_GENMASK(8, 0) +/* RPM unit config (Gen8+) */ #define RPM_CONFIG0 _MMIO(0xd00)#define GEN9_RPM_CONFIG0_CRYSTAL_CLOCK_FREQ_SHIFT 3
drivers/gpu/drm/i915/gt/intel_rps.c +10 -2
@@ -2091,7 +2091,9 @@ u32 intel_rps_get_cagf(struct intel_rps *rps, u32 rpstat)struct drm_i915_private *i915 =rps_to_i915 (rps);u32 cagf; -if (GRAPHICS_VER (i915) >=12 ) +if (GRAPHICS_VER_FULL (i915) >=IP_VER (12 ,70 )) + cagf =REG_FIELD_GET (MTL_CAGF_MASK , rpstat); +else if (GRAPHICS_VER (i915) >=12 ) cagf =REG_FIELD_GET (GEN12_CAGF_MASK , rpstat);else if (IS_VALLEYVIEW (i915) ||IS_CHERRYVIEW (i915)) cagf =REG_FIELD_GET (RPE_MASK , rpstat);
@@ -2113,7 +2115,13 @@ static u32 read_cagf(struct intel_rps *rps)struct intel_uncore *uncore =rps_to_uncore (rps);u32 freq; -if (GRAPHICS_VER (i915) >=12 ) { +/* +* For Gen12+ reading freq from HW does not need a forcewake and +* registers will return 0 freq when GT is in RC6 +*/ +if (GRAPHICS_VER_FULL (i915) >=IP_VER (12 ,70 )) { + freq =intel_uncore_read (uncore,MTL_MIRROR_TARGET_WP1 ); + }else if (GRAPHICS_VER (i915) >=12 ) { freq =intel_uncore_read (uncore,GEN12_RPSTAT1 ); }else if (IS_VALLEYVIEW (i915) ||IS_CHERRYVIEW (i915)) {vlv_punit_get (i915);
Signature · 1 line
2.38.0
PATCH 4/5 drm/i915/gt: Use RC6 residency types as arguments to residency functions
In reply to Ashutosh DixitPreviously RC6 residency functions directly accepted RC6 residency register MMIO offsets (there are four RC6 residency registers). This worked but required an assumption on the residency register layout so was not future proof.
Therefore change RC6 residency functions to accept RC6 residency types instead of register MMIO offsets. The knowledge of register offsets as well as ID to offset mapping is now maintained solely in intel_rc6 and can be tailored for different platforms and different register layouts as need arises.
v2: Address review comments by Jani N
- Change residency functions to accept RC6 residency types instead of register ID's
- s/intel_rc6_print_rc5_res/intel_rc6_print_residency/
- Remove "const enum" in function arguments
- Naming: intel_rc6_* for enum
- Use INTEL_RC6_RES_MAX and other minor changes
v3: Don't include intel_rc6_types.h in intel_rc6.h (Jani)
--- drivers/gpu/drm/i915/gt/intel_gt_pm_debugfs.c | 27 +++------ drivers/gpu/drm/i915/gt/intel_gt_sysfs_pm.c | 12 ++-- drivers/gpu/drm/i915/gt/intel_rc6.c | 55 +++++++++++-------- drivers/gpu/drm/i915/gt/intel_rc6.h | 11 ++-- drivers/gpu/drm/i915/gt/intel_rc6_types.h | 15 ++++- drivers/gpu/drm/i915/gt/selftest_rc6.c | 6 +- drivers/gpu/drm/i915/i915_pmu.c | 6 +- 7 files changed, 72 insertions(+), 60 deletions(-)
drivers/gpu/drm/i915/gt/intel_gt_pm_debugfs.c +7 -20
@@ -83,19 +83,6 @@ static int fw_domains_show(struct seq_file *m, void *data) }DEFINE_INTEL_GT_DEBUGFS_ATTRIBUTE (fw_domains); -static void print_rc6_res (struct seq_file *m, -const char *title, -const i915_reg_t reg) -{ -struct intel_gt *gt = m->private; -intel_wakeref_t wakeref; - - with_intel_runtime_pm(gt->uncore->rpm, wakeref) -seq_printf (m,"%s %u (%llu us)\n" , title, -intel_uncore_read (gt->uncore, reg), -intel_rc6_residency_us (>->rc6, reg)); -} -static int vlv_drpc (struct seq_file *m) {struct intel_gt *gt = m->private;
@@ -115,8 +102,8 @@ static int vlv_drpc(struct seq_file *m)seq_printf (m,"Media Power Well: %s\n" , (pw_status &VLV_GTLC_PW_MEDIA_STATUS_MASK ) ?"Up" :"Down" ); -print_rc6_res (m,"Render RC6 residency since boot:" ,GEN6_GT_GFX_RC6 ); -print_rc6_res (m,"Media RC6 residency since boot:" ,VLV_GT_MEDIA_RC6 ); +intel_rc6_print_residency (m,"Render RC6 residency since boot:" ,INTEL_RC6_RES_RC6 ); +intel_rc6_print_residency (m,"Media RC6 residency since boot:" ,INTEL_RC6_RES_VLV_MEDIA );return fw_domains_show (m,NULL ); }
@@ -192,11 +179,11 @@ static int gen6_drpc(struct seq_file *m) }/* Not exactly sure what this is */ -print_rc6_res (m,"RC6 \"Locked to RPn\" residency since boot:" , -GEN6_GT_GFX_RC6_LOCKED ); -print_rc6_res (m,"RC6 residency since boot:" ,GEN6_GT_GFX_RC6 ); -print_rc6_res (m,"RC6+ residency since boot:" , GEN6_GT_GFX_RC6p); -print_rc6_res (m,"RC6++ residency since boot:" , GEN6_GT_GFX_RC6pp); +intel_rc6_print_residency (m,"RC6 \"Locked to RPn\" residency since boot:" , +INTEL_RC6_RES_RC6_LOCKED ); +intel_rc6_print_residency (m,"RC6 residency since boot:" ,INTEL_RC6_RES_RC6 ); +intel_rc6_print_residency (m,"RC6+ residency since boot:" , INTEL_RC6_RES_RC6p); +intel_rc6_print_residency (m,"RC6++ residency since boot:" , INTEL_RC6_RES_RC6pp);if (GRAPHICS_VER (i915) <=7 ) { seq_printf(m, "RC6 voltage: %dmV\n",
drivers/gpu/drm/i915/gt/intel_gt_sysfs_pm.c +6 -6
@@ -93,13 +93,13 @@ sysfs_gt_attribute_r_func(struct device *dev, struct device_attribute *attr, sysfs_gt_attribute_r_func(d, a, f, INTEL_GT_SYSFS_MAX)#ifdef CONFIG_PM -static u32 get_residency (struct intel_gt *gt,i915_reg_t reg) +static u32 get_residency (struct intel_gt *gt,enum intel_rc6_res_type id) {intel_wakeref_t wakeref;u64 res =0 ;with_intel_runtime_pm (gt->uncore->rpm, wakeref) - res = intel_rc6_residency_us(>->rc6, reg); + res = intel_rc6_residency_us(>->rc6, id);return DIV_ROUND_CLOSEST_ULL (res,1000 ); }
@@ -123,7 +123,7 @@ static ssize_t rc6_enable_show(struct device *dev,static u32 __rc6_residency_ms_show (struct intel_gt *gt) { -return get_residency (gt,GEN6_GT_GFX_RC6 ); +return get_residency (gt,INTEL_RC6_RES_RC6 ); } static ssize_t rc6_residency_ms_show(struct device *dev,
@@ -138,7 +138,7 @@ static ssize_t rc6_residency_ms_show(struct device *dev,static u32 __rc6p_residency_ms_show (struct intel_gt *gt) { -return get_residency (gt, GEN6_GT_GFX_RC6p); +return get_residency (gt, INTEL_RC6_RES_RC6p); } static ssize_t rc6p_residency_ms_show(struct device *dev,
@@ -153,7 +153,7 @@ static ssize_t rc6p_residency_ms_show(struct device *dev,static u32 __rc6pp_residency_ms_show (struct intel_gt *gt) { -return get_residency (gt, GEN6_GT_GFX_RC6pp); +return get_residency (gt, INTEL_RC6_RES_RC6pp); } static ssize_t rc6pp_residency_ms_show(struct device *dev,
@@ -168,7 +168,7 @@ static ssize_t rc6pp_residency_ms_show(struct device *dev,static u32 __media_rc6_residency_ms_show (struct intel_gt *gt) { -return get_residency (gt,VLV_GT_MEDIA_RC6 ); +return get_residency (gt,INTEL_RC6_RES_VLV_MEDIA ); } static ssize_t media_rc6_residency_ms_show(struct device *dev,
drivers/gpu/drm/i915/gt/intel_rc6.c +33 -22
104 lines not on this page · raw message
drivers/gpu/drm/i915/gt/intel_rc6.h +7 -4
@@ -6,10 +6,11 @@#ifndef INTEL_RC6_H #define INTEL_RC6_H -#include "i915_reg_defs.h" +#include <linux/types.h> -struct intel_engine_cs ; +enum intel_rc6_res_type ;struct intel_rc6 ; +struct seq_file ;void intel_rc6_init (struct intel_rc6 *rc6);void intel_rc6_fini (struct intel_rc6 *rc6);
@@ -21,7 +22,9 @@ void intel_rc6_sanitize(struct intel_rc6 *rc6);void intel_rc6_enable (struct intel_rc6 *rc6);void intel_rc6_disable (struct intel_rc6 *rc6); -u64 intel_rc6_residency_ns (struct intel_rc6 *rc6,i915_reg_t reg); -u64 intel_rc6_residency_us (struct intel_rc6 *rc6,i915_reg_t reg); +u64 intel_rc6_residency_ns (struct intel_rc6 *rc6,enum intel_rc6_res_type id); +u64 intel_rc6_residency_us (struct intel_rc6 *rc6,enum intel_rc6_res_type id); +void intel_rc6_print_residency (struct seq_file *m,const char *title, +enum intel_rc6_res_type id);#endif /* INTEL_RC6_H */
drivers/gpu/drm/i915/gt/intel_rc6_types.h +13 -2
@@ -13,9 +13,20 @@struct drm_i915_gem_object ; +/* RC6 residency types */ +enum intel_rc6_res_type { +INTEL_RC6_RES_RC6_LOCKED , +INTEL_RC6_RES_RC6 , + INTEL_RC6_RES_RC6p, + INTEL_RC6_RES_RC6pp, +INTEL_RC6_RES_MAX , +INTEL_RC6_RES_VLV_MEDIA = INTEL_RC6_RES_RC6p, +}; +struct intel_rc6 { -u64 prev_hw_residency[4 ]; -u64 cur_residency[4 ]; +i915_reg_t res_reg[INTEL_RC6_RES_MAX ]; +u64 prev_hw_residency[INTEL_RC6_RES_MAX ]; +u64 cur_residency[INTEL_RC6_RES_MAX ];u32 ctl_enable;
drivers/gpu/drm/i915/gt/selftest_rc6.c +3 -3
@@ -19,11 +19,11 @@ static u64 rc6_residency(struct intel_rc6 *rc6)/* XXX VLV_GT_MEDIA_RC6? */ - result =intel_rc6_residency_ns (rc6,GEN6_GT_GFX_RC6 ); + result =intel_rc6_residency_ns (rc6,INTEL_RC6_RES_RC6 );if (HAS_RC6p (rc6_to_i915 (rc6))) - result +=intel_rc6_residency_ns (rc6, GEN6_GT_GFX_RC6p); + result +=intel_rc6_residency_ns (rc6, INTEL_RC6_RES_RC6p);if (HAS_RC6pp (rc6_to_i915 (rc6))) - result +=intel_rc6_residency_ns (rc6, GEN6_GT_GFX_RC6pp); + result +=intel_rc6_residency_ns (rc6, INTEL_RC6_RES_RC6pp);return result; }
drivers/gpu/drm/i915/i915_pmu.c +3 -3
@@ -148,13 +148,13 @@ static u64 __get_rc6(struct intel_gt *gt)struct drm_i915_private *i915 = gt->i915;u64 val; - val =intel_rc6_residency_ns (>->rc6,GEN6_GT_GFX_RC6 ); + val =intel_rc6_residency_ns (>->rc6,INTEL_RC6_RES_RC6 );if (HAS_RC6p (i915)) - val +=intel_rc6_residency_ns (>->rc6, GEN6_GT_GFX_RC6p); + val +=intel_rc6_residency_ns (>->rc6, INTEL_RC6_RES_RC6p);if (HAS_RC6pp (i915)) - val +=intel_rc6_residency_ns (>->rc6, GEN6_GT_GFX_RC6pp); + val +=intel_rc6_residency_ns (>->rc6, INTEL_RC6_RES_RC6pp);return val; }
Signature · 1 line
2.38.0
PATCH 5/5 drm/i915/mtl: C6 residency and C state type for MTL SAMedia
In reply to Ashutosh DixitFrom: Badal Nilawar <[email protected]>
Add support for C6 residency and C state type for MTL SAMedia. Also add mtl_drpc.
v2: Fixed review comments (Ashutosh)
v3: Sort registers and fix whitespace errors in intel_gt_regs.h (Matt R)
Remove MTL_CC_SHIFT (Ashutosh)
Adapt to RC6 residency register code refactor (Jani N)
v4: Move MTL branch to top in drpc_show
v5: Use FORCEWAKE_MT identical to gen6_drpc (Ashutosh)
v6: Add MISSING_CASE for gt_core_status switch statement (Rodrigo)
Change state name for MTL_CC0 to C0 (from "on") (Rodrigo)
--- drivers/gpu/drm/i915/gt/intel_gt_pm_debugfs.c | 59 ++++++++++++++++++- drivers/gpu/drm/i915/gt/intel_gt_regs.h | 5 ++ drivers/gpu/drm/i915/gt/intel_rc6.c | 17 ++++-- 3 files changed, 76 insertions(+), 5 deletions(-)
drivers/gpu/drm/i915/gt/intel_gt_pm_debugfs.c +58 -1
@@ -256,6 +256,61 @@ static int ilk_drpc(struct seq_file *m)return 0 ; } +static int mtl_drpc (struct seq_file *m) +{ +struct intel_gt *gt = m->private; +struct intel_uncore *uncore = gt->uncore; +u32 gt_core_status, rcctl1, mt_fwake_req; +u32 mtl_powergate_enable =0 , mtl_powergate_status =0 ; + + mt_fwake_req =intel_uncore_read_fw (uncore,FORCEWAKE_MT ); + gt_core_status =intel_uncore_read (uncore,MTL_MIRROR_TARGET_WP1 ); + + rcctl1 =intel_uncore_read (uncore,GEN6_RC_CONTROL ); + mtl_powergate_enable =intel_uncore_read (uncore,GEN9_PG_ENABLE ); + mtl_powergate_status =intel_uncore_read (uncore, +GEN9_PWRGT_DOMAIN_STATUS ); + +seq_printf (m,"RC6 Enabled: %s\n" , +str_yes_no (rcctl1 &GEN6_RC_CTL_RC6_ENABLE )); +if (gt->type ==GT_MEDIA ) { +seq_printf (m,"Media Well Gating Enabled: %s\n" , +str_yes_no (mtl_powergate_enable &GEN9_MEDIA_PG_ENABLE )); + }else { +seq_printf (m,"Render Well Gating Enabled: %s\n" , +str_yes_no (mtl_powergate_enable &GEN9_RENDER_PG_ENABLE )); + } + +seq_puts (m,"Current RC state: " ); +switch (REG_FIELD_GET (MTL_CC_MASK , gt_core_status)) { +case MTL_CC0 : +seq_puts (m,"C0\n" ); +break ; +case MTL_CC6 : +seq_puts (m,"RC6\n" ); +break ; +default : +MISSING_CASE (REG_FIELD_GET (MTL_CC_MASK , gt_core_status)); +seq_puts (m,"Unknown\n" ); +break ; + } + +seq_printf (m,"Multi-threaded Forcewake Request: 0x%x\n" , mt_fwake_req); +if (gt->type ==GT_MEDIA ) +seq_printf (m,"Media Power Well: %s\n" , + (mtl_powergate_status & +GEN9_PWRGT_MEDIA_STATUS_MASK ) ?"Up" :"Down" ); +else +seq_printf (m,"Render Power Well: %s\n" , + (mtl_powergate_status & +GEN9_PWRGT_RENDER_STATUS_MASK ) ?"Up" :"Down" ); + +/* Works for both render and media gt's */ +intel_rc6_print_residency (m,"RC6 residency since boot:" ,INTEL_RC6_RES_RC6 ); + +return fw_domains_show (m,NULL ); +} +static int drpc_show (struct seq_file *m,void *unused) {struct intel_gt *gt = m->private;
@@ -264,7 +319,9 @@ static int drpc_show(struct seq_file *m, void *unused)int err = -ENODEV ; with_intel_runtime_pm(gt->uncore->rpm, wakeref) { -if (IS_VALLEYVIEW (i915) ||IS_CHERRYVIEW (i915)) +if (GRAPHICS_VER_FULL (i915) >=IP_VER (12 ,70 )) + err =mtl_drpc (m); +else if (IS_VALLEYVIEW (i915) ||IS_CHERRYVIEW (i915)) err =vlv_drpc (m);else if (GRAPHICS_VER (i915) >=6 ) err =gen6_drpc (m);
drivers/gpu/drm/i915/gt/intel_gt_regs.h +5 -0
@@ -24,6 +24,9 @@/* MTL workpoint reg to get core C state and actual freq of 3D, SAMedia */ #define MTL_MIRROR_TARGET_WP1 _MMIO(0xc60)#define MTL_CAGF_MASK REG_GENMASK(8, 0) +#define MTL_CC0 0x0 +#define MTL_CC6 0x3 +#define MTL_CC_MASK REG_GENMASK(12, 9)/* RPM unit config (Gen8+) */ #define RPM_CONFIG0 _MMIO(0xd00)
@@ -1512,6 +1515,8 @@#define FORCEWAKE_MEDIA_VLV _MMIO(0x1300b8)#define FORCEWAKE_ACK_MEDIA_VLV _MMIO(0x1300bc) +#define MTL_MEDIA_MC6 _MMIO(0x138048) +#define GEN6_GT_THREAD_STATUS_REG _MMIO(0x13805c)#define GEN6_GT_THREAD_STATUS_CORE_MASK 0x7
drivers/gpu/drm/i915/gt/intel_rc6.c +13 -4
@@ -553,10 +553,19 @@ static void __intel_rc6_disable(struct intel_rc6 *rc6)static void rc6_res_reg_init (struct intel_rc6 *rc6) { - rc6->res_reg[INTEL_RC6_RES_RC6_LOCKED ] =GEN6_GT_GFX_RC6_LOCKED ; - rc6->res_reg[INTEL_RC6_RES_RC6 ] =GEN6_GT_GFX_RC6 ; - rc6->res_reg[INTEL_RC6_RES_RC6p] = GEN6_GT_GFX_RC6p; - rc6->res_reg[INTEL_RC6_RES_RC6pp] = GEN6_GT_GFX_RC6pp; +memset (rc6->res_reg,INVALID_MMIO_REG .reg,sizeof (rc6->res_reg)); + +switch (rc6_to_gt (rc6)->type) { +case GT_MEDIA : + rc6->res_reg[INTEL_RC6_RES_RC6 ] =MTL_MEDIA_MC6 ; +break ; +default : + rc6->res_reg[INTEL_RC6_RES_RC6_LOCKED ] =GEN6_GT_GFX_RC6_LOCKED ; + rc6->res_reg[INTEL_RC6_RES_RC6 ] =GEN6_GT_GFX_RC6 ; + rc6->res_reg[INTEL_RC6_RES_RC6p] = GEN6_GT_GFX_RC6p; + rc6->res_reg[INTEL_RC6_RES_RC6pp] = GEN6_GT_GFX_RC6pp; +break ; + } }void intel_rc6_init (struct intel_rc6 *rc6)
Signature · 1 line
2.38.0
Re: [PATCH 5/5] drm/i915/mtl: C6 residency and C state type for MTL SAMedia
Quoted 49 lines · Ashutosh Dixit
From: Badal Nilawar <[email protected]>
Add support for C6 residency and C state type for MTL SAMedia. Also add
mtl_drpc.v2: Fixed review comments (Ashutosh)
v3: Sort registers and fix whitespace errors inintel_gt_regs.h(Matt R)
RemoveMTL_CC_SHIFT(Ashutosh)
Adapt to RC6 residency register code refactor (Jani N)
v4: Move MTL branch to top indrpc_show
v5: UseFORCEWAKE_MTidentical togen6_drpc(Ashutosh)
v6: AddMISSING_CASEforgt_core_statusswitch statement (Rodrigo)
Change state name forMTL_CC0to C0 (from "on") (Rodrigo)Signed-off-by Ashutosh Dixit <[email protected]>Signed-off-by Badal Nilawar <[email protected]>--- drivers/gpu/drm/i915/gt/intel_gt_pm_debugfs.c | 59 ++++++++++++++++++- drivers/gpu/drm/i915/gt/intel_gt_regs.h | 5 ++ drivers/gpu/drm/i915/gt/intel_rc6.c | 17 ++++-- 3 files changed, 76 insertions(+), 5 deletions(-)drivers/gpu/drm/i915/gt/intel_gt_pm_debugfs.c +19
-0@@ -256,6 +256,61 @@ static int ilk_drpc(struct seq_file *m)return 0 ; } +static int mtl_drpc (struct seq_file *m) +{ +struct intel_gt *gt = m->private; +struct intel_uncore *uncore = gt->uncore; +u32 gt_core_status, rcctl1, mt_fwake_req; +u32 mtl_powergate_enable =0 , mtl_powergate_status =0 ; + + mt_fwake_req =intel_uncore_read_fw (uncore,FORCEWAKE_MT ); + gt_core_status =intel_uncore_read (uncore,MTL_MIRROR_TARGET_WP1 ); + + rcctl1 =intel_uncore_read (uncore,GEN6_RC_CONTROL ); + mtl_powergate_enable =intel_uncore_read (uncore,GEN9_PG_ENABLE ); + mtl_powergate_status =intel_uncore_read (uncore, +GEN9_PWRGT_DOMAIN_STATUS ); + +seq_printf (m,"RC6 Enabled: %s\n" , +str_yes_no (rcctl1 &GEN6_RC_CTL_RC6_ENABLE )); +if (gt->type ==GT_MEDIA ) { + seq_printf(m, "Media Well Gating Enabled: %s\n",
drivers/gpu/drm/i915/gt/intel_gt_pm_debugfs.c static int ilk_drpc(struct seq_file *m) · line 287
Quoted 10 lines
drivers/gpu/drm/i915/gt/intel_gt_pm_debugfs.c +10
-0+ str_yes_no(mtl_powergate_enable & GEN9_MEDIA_PG_ENABLE)); + }else { +seq_printf (m,"Render Well Gating Enabled: %s\n" , +str_yes_no (mtl_powergate_enable &GEN9_RENDER_PG_ENABLE )); + } + +seq_puts (m,"Current RC state: " ); +switch (REG_FIELD_GET (MTL_CC_MASK , gt_core_status)) { +case MTL_CC0 : +seq_puts (m,"C0\n" );
RC0, then
Quoted 94 lines
drivers/gpu/drm/i915/gt/intel_gt_pm_debugfs.c +29
-1+break ; +case MTL_CC6 : +seq_puts (m,"RC6\n" ); +break ; +default : +MISSING_CASE (REG_FIELD_GET (MTL_CC_MASK , gt_core_status)); +seq_puts (m,"Unknown\n" ); +break ; + } + +seq_printf (m,"Multi-threaded Forcewake Request: 0x%x\n" , mt_fwake_req); +if (gt->type ==GT_MEDIA ) +seq_printf (m,"Media Power Well: %s\n" , + (mtl_powergate_status & +GEN9_PWRGT_MEDIA_STATUS_MASK ) ?"Up" :"Down" ); +else +seq_printf (m,"Render Power Well: %s\n" , + (mtl_powergate_status & +GEN9_PWRGT_RENDER_STATUS_MASK ) ?"Up" :"Down" ); + +/* Works for both render and media gt's */ +intel_rc6_print_residency (m,"RC6 residency since boot:" ,INTEL_RC6_RES_RC6 ); + +return fw_domains_show (m,NULL ); +} +static int drpc_show (struct seq_file *m,void *unused) {struct intel_gt *gt = m->private;@@ -264,7 +319,9 @@ static int drpc_show(struct seq_file *m, void *unused)int err = -ENODEV ; with_intel_runtime_pm(gt->uncore->rpm, wakeref) { -if (IS_VALLEYVIEW (i915) ||IS_CHERRYVIEW (i915)) +if (GRAPHICS_VER_FULL (i915) >=IP_VER (12 ,70 )) + err =mtl_drpc (m); +else if (IS_VALLEYVIEW (i915) ||IS_CHERRYVIEW (i915)) err =vlv_drpc (m);else if (GRAPHICS_VER (i915) >=6 ) err =gen6_drpc (m);drivers/gpu/drm/i915/gt/intel_gt_regs.h +5
-0@@ -24,6 +24,9 @@/* MTL workpoint reg to get core C state and actual freq of 3D, SAMedia */ #define MTL_MIRROR_TARGET_WP1 _MMIO(0xc60)#define MTL_CAGF_MASK REG_GENMASK(8, 0) +#define MTL_CC0 0x0 +#define MTL_CC6 0x3 +#define MTL_CC_MASK REG_GENMASK(12, 9)/* RPM unit config (Gen8+) */ #define RPM_CONFIG0 _MMIO(0xd00)@@ -1512,6 +1515,8 @@#define FORCEWAKE_MEDIA_VLV _MMIO(0x1300b8)#define FORCEWAKE_ACK_MEDIA_VLV _MMIO(0x1300bc) +#define MTL_MEDIA_MC6 _MMIO(0x138048) +#define GEN6_GT_THREAD_STATUS_REG _MMIO(0x13805c)#define GEN6_GT_THREAD_STATUS_CORE_MASK 0x7drivers/gpu/drm/i915/gt/intel_rc6.c +13
-4@@ -553,10 +553,19 @@ static void __intel_rc6_disable(struct intel_rc6 *rc6)static void rc6_res_reg_init (struct intel_rc6 *rc6) { - rc6->res_reg[INTEL_RC6_RES_RC6_LOCKED ] =GEN6_GT_GFX_RC6_LOCKED ; - rc6->res_reg[INTEL_RC6_RES_RC6 ] =GEN6_GT_GFX_RC6 ; - rc6->res_reg[INTEL_RC6_RES_RC6p] = GEN6_GT_GFX_RC6p; - rc6->res_reg[INTEL_RC6_RES_RC6pp] = GEN6_GT_GFX_RC6pp; +memset (rc6->res_reg,INVALID_MMIO_REG .reg,sizeof (rc6->res_reg)); + +switch (rc6_to_gt (rc6)->type) { +case GT_MEDIA : + rc6->res_reg[INTEL_RC6_RES_RC6 ] =MTL_MEDIA_MC6 ; +break ; +default : + rc6->res_reg[INTEL_RC6_RES_RC6_LOCKED ] =GEN6_GT_GFX_RC6_LOCKED ; + rc6->res_reg[INTEL_RC6_RES_RC6 ] =GEN6_GT_GFX_RC6 ; + rc6->res_reg[INTEL_RC6_RES_RC6p] = GEN6_GT_GFX_RC6p; + rc6->res_reg[INTEL_RC6_RES_RC6pp] = GEN6_GT_GFX_RC6pp; +break ; + } }void intel_rc6_init (struct intel_rc6 *rc6)Signature · 1 line
2.38.0