Add DG2 OA support
Subsystems (3)
v5 cover Add DG2 OA support
Add OA format support for DG2 and various fixes for DG2.
This series has 2 uapi changes listed below:
1) drm/i915/perf: Add OAG and OAR formats for DG2
DG2 has new OA formats defined that can be selected by the user. The UMD changes that are consumed by GPUvis are:
https://patchwork.freedesktop.org/patch/504456/?series=107633&rev=5
Mesa MR: https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/18893
2) drm/i915/perf: Apply Wa_18013179988
DG2 has a bug where the OA timestamp does not tick at the CS timestamp frequency. Instead it ticks at a multiple that is determined from the CTC_SHIFT value in RPM_CONFIG. Since the timestamp is used by UMD to make sense of all the counters in the report, expose the OA timestamp frequency to the user. The interface is generic and applies to all platforms. On platforms where the bug is not present, this returns the CS timestamp frequency. UMD specific changes consumed by GPUvis are:
https://patchwork.freedesktop.org/patch/504464/?series=107633&rev=5
Mesa MR: https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/18893
v2:
- Add review comments
- Update uapi changes in cover letter
- Drop patches for non-production platforms drm/i915/perf: Use helpers to process reports w.r.t. OA buffer size drm/i915/perf: Add Wa_16010703925:dg2
- Drop 64-bit OA format changes for now drm/i915/perf: Parse 64bit report header formats correctly drm/i915/perf: Add Wa_1608133521:dg2
v3:
- Add review comments to patches 02, 04, 05, 14
- Drop Acks
v4:
- Add review comments to patch 04
- Update R-bs
- Add MR links to patches 02 and 12
v5:
- Drop unrelated comment
- Rebase and fix MCR reg write
- On pre-gen12, EU flex config is saved/restored in the context image, so save/restore EU flex config only for gen12.
Test-with: [email protected]
Lionel Landwerlin (1):
drm/i915/perf: complete programming whitelisting for XEHPSDV
Umesh Nerlige Ramappa (14):
drm/i915/perf: Fix OA filtering logic for GuC mode drm/i915/perf: Add 32-bit OAG and OAR formats for DG2 drm/i915/perf: Fix noa wait predication for DG2 drm/i915/perf: Determine gen12 oa ctx offset at runtime drm/i915/perf: Enable bytes per clock reporting in OA drm/i915/perf: Simply use stream->ctx
drm/i915/perf: Move gt-specific data from i915->perf to gt->perf drm/i915/perf: Replace gt->perf.lock with stream->lock for file ops drm/i915/perf: Use gt-specific ggtt for OA and noa-wait buffers drm/i915/perf: Store a pointer to oa_format in oa_buffer drm/i915/perf: Add Wa_1508761755:dg2
drm/i915/perf: Apply Wa_18013179988
drm/i915/perf: Save/restore EU flex counters across reset drm/i915/perf: Enable OA for DG2
Vinay Belgaumkar (1):
drm/i915/guc: Support OA when Wa_16011777198 is enabled
drivers/gpu/drm/i915/gt/intel_engine_regs.h | 1 + drivers/gpu/drm/i915/gt/intel_gpu_commands.h | 4 + drivers/gpu/drm/i915/gt/intel_gt_regs.h | 1 + drivers/gpu/drm/i915/gt/intel_gt_types.h | 3 + drivers/gpu/drm/i915/gt/intel_lrc.h | 2 + drivers/gpu/drm/i915/gt/intel_sseu.c | 4 +- .../drm/i915/gt/uc/abi/guc_actions_slpc_abi.h | 9 + drivers/gpu/drm/i915/gt/uc/intel_guc_ads.c | 10 + drivers/gpu/drm/i915/gt/uc/intel_guc_slpc.c | 66 ++ drivers/gpu/drm/i915/gt/uc/intel_guc_slpc.h | 2 + drivers/gpu/drm/i915/i915_drv.h | 5 + drivers/gpu/drm/i915/i915_getparam.c | 3 + drivers/gpu/drm/i915/i915_pci.c | 2 + drivers/gpu/drm/i915/i915_perf.c | 576 ++++++++++++++---- drivers/gpu/drm/i915/i915_perf.h | 2 + drivers/gpu/drm/i915/i915_perf_oa_regs.h | 6 +- drivers/gpu/drm/i915/i915_perf_types.h | 47 +- drivers/gpu/drm/i915/intel_device_info.h | 2 + drivers/gpu/drm/i915/selftests/i915_perf.c | 16 +- include/uapi/drm/i915_drm.h | 10 + 20 files changed, 630 insertions(+), 141 deletions(-)
Signature · 1 line
2.25.1
PATCH v5 1/16 drm/i915/perf: Fix OA filtering logic for GuC mode
With GuC mode of submission, GuC is in control of defining the context id field that is part of the OA reports. To filter reports, UMD and KMD must know what sw context id was chosen by GuC. There is not interface between KMD and GuC to determine this, so read the upper-dword of EXECLIST_STATUS to filter/squash OA reports for the specific context.
v2: Explain guc id stealing w.r.t OA use case
--- drivers/gpu/drm/i915/gt/intel_lrc.h | 2 + drivers/gpu/drm/i915/i915_perf.c | 144 ++++++++++++++++++++++++---- 2 files changed, 127 insertions(+), 19 deletions(-)
drivers/gpu/drm/i915/gt/intel_lrc.h +2 -0
@@ -110,6 +110,8 @@ enum {#define XEHP_SW_CTX_ID_WIDTH 16#define XEHP_SW_COUNTER_SHIFT 58#define XEHP_SW_COUNTER_WIDTH 6 +#define GEN12_GUC_SW_CTX_ID_SHIFT 39 +#define GEN12_GUC_SW_CTX_ID_WIDTH 16static inline void lrc_runtime_start (struct intel_context *ce) {
drivers/gpu/drm/i915/i915_perf.c +125 -19
168 lines not on this page · raw message
Signature · 1 line
2.25.1
PATCH v5 2/16 drm/i915/perf: Add 32-bit OAG and OAR formats for DG2
In reply to Umesh Nerlige RamappaAdd new OA formats for DG2.
MR: https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/18893
v2:
- Update commit title (Ashutosh)
- Coding style fixes (Lionel)
- 64 bit OA formats need UMD changes in GPUvis, drop for now and send in a separate series with UMD changes
v3:
- Update commit message to drop 64 bit related description
--- drivers/gpu/drm/i915/i915_perf.c | 7 +++++++ include/uapi/drm/i915_drm.h | 4 ++++ 2 files changed, 11 insertions(+)
drivers/gpu/drm/i915/i915_perf.c +7 -0
@@ -320,6 +320,8 @@ static const struct i915_oa_format oa_formats[I915_OA_FORMAT_MAX] = { [I915_OA_FORMAT_A12] = { 0, 64 }, [I915_OA_FORMAT_A12_B8_C8] = { 2, 128 }, [I915_OA_FORMAT_A32u40_A4u32_B8_C8] = { 5, 256 }, + [I915_OAR_FORMAT_A32u40_A4u32_B8_C8] = { 5, 256 }, + [I915_OA_FORMAT_A24u40_A14u32_B8_C8] = { 5, 256 }, };#define SAMPLE_OA_REPORT (1<<0)
@@ -4515,6 +4517,11 @@ static void oa_init_supported_formats(struct i915_perf *perf)oa_format_add (perf,I915_OA_FORMAT_C4_B8 );break ; +case INTEL_DG2 : +oa_format_add (perf, I915_OAR_FORMAT_A32u40_A4u32_B8_C8); +oa_format_add (perf, I915_OA_FORMAT_A24u40_A14u32_B8_C8); +break ; +default :MISSING_CASE (platform); }
include/uapi/drm/i915_drm.h +4 -0
@@ -2666,6 +2666,10 @@ enum drm_i915_oa_format {I915_OA_FORMAT_A12_B8_C8 , I915_OA_FORMAT_A32u40_A4u32_B8_C8, +/* DG2 */ + I915_OAR_FORMAT_A32u40_A4u32_B8_C8, + I915_OA_FORMAT_A24u40_A14u32_B8_C8, + I915_OA_FORMAT_MAX /* non-ABI */ };
Signature · 1 line
2.25.1
PATCH v5 3/16 drm/i915/perf: Fix noa wait predication for DG2
In reply to Umesh Nerlige RamappaPredication for batch buffer commands changed in XEHPSDV. MI_BATCH_BUFFER_START predicates based on MI_SET_PREDICATE_RESULT register. The MI_SET_PREDICATE_RESULT register can only be modified with MI_SET_PREDICATE command. When configured, the MI_SET_PREDICATE command sets MI_SET_PREDICATE_RESULT based on bit 0 of MI_PREDICATE_RESULT_2. Use this to configure predication in noa_wait.
--- drivers/gpu/drm/i915/gt/intel_engine_regs.h | 1 + drivers/gpu/drm/i915/i915_perf.c | 24 +++++++++++++++++---- 2 files changed, 21 insertions(+), 4 deletions(-)
drivers/gpu/drm/i915/gt/intel_engine_regs.h +1 -0
@@ -201,6 +201,7 @@#define RING_CONTEXT_STATUS_PTR (base) _MMIO((base) + 0x3a0)#define RING_CTX_TIMESTAMP (base) _MMIO((base) + 0x3a8)/* gen8+ */ #define RING_PREDICATE_RESULT (base) _MMIO((base) + 0x3b8) +#define MI_PREDICATE_RESULT_2_ENGINE (base) _MMIO((base) + 0x3bc)#define RING_FORCE_TO_NONPRIV (base, i) _MMIO(((base) + 0x4D0) + (i) * 4)#define RING_FORCE_TO_NONPRIV_DENY REG_BIT(30)#define RING_FORCE_TO_NONPRIV_ADDRESS_MASK REG_GENMASK(25, 2)
drivers/gpu/drm/i915/i915_perf.c +20 -4
@@ -286,6 +286,7 @@ static u32 i915_perf_stream_paranoid = true;#define OAREPORT_REASON_CTX_SWITCH (1<<3)#define OAREPORT_REASON_CLK_RATIO (1<<5) +#define HAS_MI_SET_PREDICATE (i915) (GRAPHICS_VER_FULL(i915) >= IP_VER(12, 50))/* For sysctl proc_dointvec_minmax of i915_oa_max_sample_rate *
@@ -1760,6 +1761,9 @@ static int alloc_noa_wait(struct i915_perf_stream *stream)DELTA_TARGET , N_CS_GPR }; +i915_reg_t mi_predicate_result =HAS_MI_SET_PREDICATE (i915) ? +MI_PREDICATE_RESULT_2_ENGINE (base) : +MI_PREDICATE_RESULT_1 (RENDER_RING_BASE ); bo =i915_gem_object_create_internal (i915,4096 );if (IS_ERR (bo)) {
@@ -1797,7 +1801,7 @@ static int alloc_noa_wait(struct i915_perf_stream *stream) stream, cs, true/* save */ ,CS_GPR (i), INTEL_GT_SCRATCH_FIELD_PERF_CS_GPR + 8 * i, 2); cs =save_restore_register ( - stream, cs, true/* save */ ,MI_PREDICATE_RESULT_1 (RENDER_RING_BASE ), + stream, cs, true/* save */ , mi_predicate_result,INTEL_GT_SCRATCH_FIELD_PERF_PREDICATE_RESULT_1 ,1 );/* First timestamp snapshot location. */
@@ -1851,7 +1855,10 @@ static int alloc_noa_wait(struct i915_perf_stream *stream)*/ *cs++ =MI_LOAD_REGISTER_REG | (3 -2 ); *cs++ =i915_mmio_reg_offset (CS_GPR (JUMP_PREDICATE )); - *cs++ =i915_mmio_reg_offset (MI_PREDICATE_RESULT_1 (RENDER_RING_BASE )); + *cs++ =i915_mmio_reg_offset (mi_predicate_result); + +if (HAS_MI_SET_PREDICATE (i915)) + *cs++ =MI_SET_PREDICATE |1 ;/* Restart from the beginning if we had timestamps roll over. */ *cs++ = (GRAPHICS_VER(i915) < 8 ?
@@ -1861,6 +1868,9 @@ static int alloc_noa_wait(struct i915_perf_stream *stream) *cs++ =i915_ggtt_offset (vma) + (ts0 - batch) *4 ; *cs++ =0 ; +if (HAS_MI_SET_PREDICATE (i915)) + *cs++ =MI_SET_PREDICATE ; +/* * Now add the diff between to previous timestamps and add it to : * (((1 * << 64) - 1) - delay_ns)
@@ -1888,7 +1898,10 @@ static int alloc_noa_wait(struct i915_perf_stream *stream)*/ *cs++ =MI_LOAD_REGISTER_REG | (3 -2 ); *cs++ =i915_mmio_reg_offset (CS_GPR (JUMP_PREDICATE )); - *cs++ =i915_mmio_reg_offset (MI_PREDICATE_RESULT_1 (RENDER_RING_BASE )); + *cs++ =i915_mmio_reg_offset (mi_predicate_result); + +if (HAS_MI_SET_PREDICATE (i915)) + *cs++ =MI_SET_PREDICATE |1 ;/* Predicate the jump. */ *cs++ = (GRAPHICS_VER(i915) < 8 ?
@@ -1898,13 +1911,16 @@ static int alloc_noa_wait(struct i915_perf_stream *stream) *cs++ =i915_ggtt_offset (vma) + (jump - batch) *4 ; *cs++ =0 ; +if (HAS_MI_SET_PREDICATE (i915)) + *cs++ =MI_SET_PREDICATE ; +/* Restore registers. */ for (i =0 ; i <N_CS_GPR ; i++) cs =save_restore_register ( stream, cs, false/* restore */ ,CS_GPR (i),INTEL_GT_SCRATCH_FIELD_PERF_CS_GPR +8 * i,2 ); cs =save_restore_register ( - stream, cs, false/* restore */ ,MI_PREDICATE_RESULT_1 (RENDER_RING_BASE ), + stream, cs, false/* restore */ , mi_predicate_result,INTEL_GT_SCRATCH_FIELD_PERF_PREDICATE_RESULT_1 ,1 );/* And return to the ring. */
Signature · 1 line
2.25.1
PATCH v5 4/16 drm/i915/perf: Determine gen12 oa ctx offset at runtime
In reply to Umesh Nerlige RamappaSome SKUs of same gen12 platform may have different oactxctrl offsets. For gen12, determine oactxctrl offsets at runtime.
v2: (Lionel)
- Move MI definitions to intel_gpu_commands.h
- Ensure __find_reg_in_lri does read past context image size
v3: (Ashutosh)
- Drop unnecessary use of double underscores
- fix find_reg_in_lri
- Return error if oa context offset is U32_MAX
- Error out if oa_ctx_ctrl_offset does not find offset
v4: (Ashutosh)
- Warn on odd MI LRI_LEN
- Remove unnecessary check for valid_oactxctrl_offset
- Drop valid_oactxctrl_offset macro
v5: Drop unrelated comment
--- drivers/gpu/drm/i915/gt/intel_gpu_commands.h | 4 + drivers/gpu/drm/i915/i915_perf.c | 146 ++++++++++++++++--- drivers/gpu/drm/i915/i915_perf_oa_regs.h | 2 +- 3 files changed, 127 insertions(+), 25 deletions(-)
drivers/gpu/drm/i915/gt/intel_gpu_commands.h +4 -0
@@ -187,6 +187,10 @@#define MI_BATCH_RESOURCE_STREAMER REG_BIT(10)#define MI_BATCH_PREDICATE REG_BIT(15)/* HSW+ on RCS only*/ +#define MI_OPCODE (x) (((x) >> 23) & 0x3f) +#define IS_MI_LRI_CMD (x) (MI_OPCODE(x) == MI_OPCODE(MI_INSTR(0x22, 0))) +#define MI_LRI_LEN (x) (((x) & 0xff) + 1) +/* * 3D instructions used by the kernel */
drivers/gpu/drm/i915/i915_perf.c +122 -24
219 lines not on this page · raw message
drivers/gpu/drm/i915/i915_perf_oa_regs.h +1 -1
@@ -97,7 +97,7 @@#define GEN12_OAR_OACONTROL_COUNTER_FORMAT_SHIFT 1#define GEN12_OAR_OACONTROL_COUNTER_ENABLE (1 << 0) -#define GEN12_OACTXCONTROL _MMIO(0x2360) +#define GEN12_OACTXCONTROL (base) _MMIO((base) + 0x360)#define GEN12_OAR_OASTATUS _MMIO(0x2968)/* Gen12 OAG unit */
Signature · 1 line
2.25.1
PATCH v5 5/16 drm/i915/perf: Enable bytes per clock reporting in OA
In reply to Umesh Nerlige RamappaXEHPSDV and DG2 provide a way to configure bytes per clock vs commands per clock reporting. Enable bytes per clock setting on enabling OA.
Bspec: 51762
Bspec: 52201
v2:
- Fix commit msg (Ashutosh)
- Fix checkpatch issues
v3:
- s/commands/bytes/ in code comment and commmit msg
--- drivers/gpu/drm/i915/i915_drv.h | 3 +++ drivers/gpu/drm/i915/i915_pci.c | 1 + drivers/gpu/drm/i915/i915_perf.c | 20 ++++++++++++++++++++ drivers/gpu/drm/i915/i915_perf_oa_regs.h | 4 ++++ drivers/gpu/drm/i915/intel_device_info.h | 1 + 5 files changed, 29 insertions(+)
drivers/gpu/drm/i915/i915_drv.h +3 -0
@@ -898,6 +898,9 @@ IS_SUBPLATFORM(const struct drm_i915_private *i915,#define HAS_RUNTIME_PM (dev_priv) (INTEL_INFO(dev_priv)->has_runtime_pm)#define HAS_64BIT_RELOC (dev_priv) (INTEL_INFO(dev_priv)->has_64bit_reloc) +#define HAS_OA_BPC_REPORTING (dev_priv) \ + (INTEL_INFO(dev_priv)->has_oa_bpc_reporting) +/* * Set this flag, when platform requires 64K GTT page sizes or larger for * device local memory access.
drivers/gpu/drm/i915/i915_pci.c +1 -0
@@ -1023,6 +1023,7 @@ static const struct intel_device_info adl_p_info = { .has_logical_ring_contexts = 1, \ .has_logical_ring_elsq = 1, \ .has_mslice_steering = 1, \ + .has_oa_bpc_reporting = 1, \ .has_rc6 = 1, \ .has_reset_engine = 1, \ .has_rps = 1, \
drivers/gpu/drm/i915/i915_perf.c +20 -0
@@ -2748,10 +2748,12 @@ static int gen12_enable_metric_set(struct i915_perf_stream *stream, struct i915_active *active) { + struct drm_i915_private *i915 = stream->perf->i915;struct intel_uncore *uncore = stream->uncore;struct i915_oa_config *oa_config = stream->oa_config;bool periodic = stream->periodic;u32 period_exponent = stream->period_exponent; +u32 sqcnt1;int ret; intel_uncore_write(uncore, GEN12_OAG_OA_DEBUG,
@@ -2770,6 +2772,16 @@ gen12_enable_metric_set(struct i915_perf_stream *stream, (period_exponent << GEN12_OAG_OAGLBCTXCTRL_TIMER_PERIOD_SHIFT)) : 0); +/* +* Initialize Super Queue Internal Cnt Register +* Set PMON Enable in order to collect valid metrics. +* Enable byets per clock reporting in OA for XEHPSDV onward. +*/ + sqcnt1 =GEN12_SQCNT1_PMON_ENABLE | + (HAS_OA_BPC_REPORTING (i915) ?GEN12_SQCNT1_OABPC :0 ); + +intel_uncore_rmw (uncore,GEN12_SQCNT1 ,0 , sqcnt1); +/* * Update all contexts prior writing the mux configurations as we need * to make sure all slices/subslices are ON before writing to NOA
@@ -2819,6 +2831,8 @@ static void gen11_disable_metric_set(struct i915_perf_stream *stream)static void gen12_disable_metric_set (struct i915_perf_stream *stream) {struct intel_uncore *uncore = stream->uncore; +struct drm_i915_private *i915 = stream->perf->i915; +u32 sqcnt1;/* Reset all contexts' slices/subslices configurations. */ gen12_configure_all_contexts (stream,NULL ,NULL );
@@ -2829,6 +2843,12 @@ static void gen12_disable_metric_set(struct i915_perf_stream *stream)/* Make sure we disable noa to save power. */ intel_uncore_rmw (uncore,RPM_CONFIG1 ,GEN10_GT_NOA_ENABLE ,0 ); + + sqcnt1 =GEN12_SQCNT1_PMON_ENABLE | + (HAS_OA_BPC_REPORTING (i915) ?GEN12_SQCNT1_OABPC :0 ); + +/* Reset PMON Enable to save power. */ +intel_uncore_rmw (uncore,GEN12_SQCNT1 , sqcnt1,0 ); }static void gen7_oa_enable (struct i915_perf_stream *stream)
drivers/gpu/drm/i915/i915_perf_oa_regs.h +4 -0
@@ -134,4 +134,8 @@#define GDT_CHICKEN_BITS _MMIO(0x9840)#define GT_NOA_ENABLE 0x00000080 +#define GEN12_SQCNT1 _MMIO(0x8718) +#define GEN12_SQCNT1_PMON_ENABLE REG_BIT(30) +#define GEN12_SQCNT1_OABPC REG_BIT(29) +#endif /* __INTEL_PERF_OA_REGS__ */
drivers/gpu/drm/i915/intel_device_info.h +1 -0
@@ -164,6 +164,7 @@ enum intel_ppgtt_type {func (has_logical_ring_elsq); \func (has_media_ratio_mode); \func (has_mslice_steering); \ +func (has_oa_bpc_reporting); \func (has_one_eu_per_fuse_bit); \func (has_pxp); \func (has_rc6); \
Signature · 1 line
2.25.1
PATCH v5 6/16 drm/i915/perf: Simply use stream->ctx
In reply to Umesh Nerlige RamappaEarlier code used exclusive_stream to check for user passed context. Simplify this by accessing stream->ctx.
--- drivers/gpu/drm/i915/i915_perf.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
drivers/gpu/drm/i915/i915_perf.c +2 -2
@@ -776,7 +776,7 @@ static int gen8_append_oa_reports(struct i915_perf_stream *stream,* switches since it's not-uncommon for periodic samples to * identify a switch before any 'context switch' report. */ -if (!stream->perf->exclusive_stream->ctx || +if (!stream->ctx || stream->specific_ctx_id == ctx_id || stream->oa_buffer.last_ctx_id == stream->specific_ctx_id || reason &OAREPORT_REASON_CTX_SWITCH ) {
@@ -785,7 +785,7 @@ static int gen8_append_oa_reports(struct i915_perf_stream *stream,* While filtering for a single context we avoid * leaking the IDs of other contexts. */ -if (stream->perf->exclusive_stream->ctx && +if (stream->ctx && stream->specific_ctx_id != ctx_id) { report32[2 ] =INVALID_CTX_ID ; }
Signature · 1 line
2.25.1
PATCH v5 7/16 drm/i915/perf: Move gt-specific data from i915->perf to gt->perf
In reply to Umesh Nerlige RamappaMake perf part of gt as the OAG buffer is specific to a gt. The refactor eventually simplifies programming the right OA buffer and the right HW registers when supporting multiple gts.
--- drivers/gpu/drm/i915/gt/intel_gt_types.h | 3 + drivers/gpu/drm/i915/gt/intel_sseu.c | 4 +- drivers/gpu/drm/i915/i915_perf.c | 75 +++++++++++++--------- drivers/gpu/drm/i915/i915_perf_types.h | 39 +++++------ drivers/gpu/drm/i915/selftests/i915_perf.c | 16 +++-- 5 files changed, 80 insertions(+), 57 deletions(-)
drivers/gpu/drm/i915/gt/intel_gt_types.h +3 -0
@@ -20,6 +20,7 @@#include "intel_gsc.h" #include "i915_vma.h" +#include "i915_perf_types.h" #include "intel_engine_types.h" #include "intel_gt_buffer_pool_types.h" #include "intel_hwconfig.h"
@@ -289,6 +290,8 @@ struct intel_gt {/* sysfs defaults per gt */ struct gt_defaults defaults;struct kobject *sysfs_defaults; + +struct i915_perf_gt perf; };struct intel_gt_definition {
drivers/gpu/drm/i915/gt/intel_sseu.c +2 -2
@@ -677,8 +677,8 @@ u32 intel_sseu_make_rpcs(struct intel_gt *gt,* If i915/perf is active, we want a stable powergating configuration * on the system. Use the configuration pinned by i915/perf. */ -if (i915->perf.exclusive_stream) - req_sseu = &i915->perf.sseu; +if (gt->perf.exclusive_stream) + req_sseu = >->perf.sseu; slices =hweight8 (req_sseu->slice_mask); subslices =hweight8 (req_sseu->subslice_mask);
drivers/gpu/drm/i915/i915_perf.c +44 -31
241 lines not on this page · raw message
drivers/gpu/drm/i915/i915_perf_types.h +20 -19
@@ -380,6 +380,26 @@ struct i915_oa_ops {u32 (*oa_hw_tail_read)(struct i915_perf_stream *stream); }; +struct i915_perf_gt { +/* +* Lock associated with anything below within this structure. +*/ +struct mutex lock; + +/** +* @sseu: sseu configuration selected to run while perf is active, +* applies to all contexts. +*/ +struct intel_sseu sseu; + +/* +* @exclusive_stream: The stream currently using the OA unit. This is +* sometimes accessed outside a syscall associated to its file +* descriptor. +*/ +struct i915_perf_stream *exclusive_stream; +}; +struct i915_perf {struct drm_i915_private *i915;
@@ -397,25 +417,6 @@ struct i915_perf {*/ struct idr metrics_idr; -/* -* Lock associated with anything below within this structure -* except exclusive_stream. -*/ -struct mutex lock; - -/* -* The stream currently using the OA unit. If accessed -* outside a syscall associated to its file -* descriptor. -*/ -struct i915_perf_stream *exclusive_stream; - -/** -* @sseu: sseu configuration selected to run while perf is active, -* applies to all contexts. -*/ -struct intel_sseu sseu; -/** * For rate limiting any notifications of spurious * invalid OA reports
drivers/gpu/drm/i915/selftests/i915_perf.c +11 -5
@@ -102,6 +102,12 @@ test_stream(struct i915_perf *perf) I915_OA_FORMAT_A32u40_A4u32_B8_C8 : I915_OA_FORMAT_C4_B8, };struct i915_perf_stream *stream; +struct intel_gt *gt; + +if (!props.engine) +return NULL ; + + gt = props.engine->gt;if (!oa_config)return NULL ;
@@ -116,12 +122,12 @@ test_stream(struct i915_perf *perf) stream->perf = perf; -mutex_lock (&perf->lock); +mutex_lock (>->perf.lock);if (i915_oa_stream_init (stream, ¶m, &props)) {kfree (stream); stream =NULL ; } -mutex_unlock (&perf->lock); +mutex_unlock (>->perf.lock);i915_oa_config_put (oa_config);
@@ -130,11 +136,11 @@ test_stream(struct i915_perf *perf)static void stream_destroy (struct i915_perf_stream *stream) { -struct i915_perf *perf = stream->perf; +struct intel_gt *gt = stream->engine->gt; -mutex_lock (&perf->lock); +mutex_lock (>->perf.lock);i915_perf_destroy_locked (stream); -mutex_unlock (&perf->lock); +mutex_unlock (>->perf.lock); }static int live_sanitycheck (void *arg)
Signature · 1 line
2.25.1
PATCH v5 8/16 drm/i915/perf: Replace gt->perf.lock with stream->lock for file ops
In reply to Umesh Nerlige RamappaWith multi-gt, user can access multiple OA buffers concurrently. Use stream->lock instead of gt->perf.lock to serialize file operations.
--- drivers/gpu/drm/i915/i915_perf.c | 31 ++++++++++++-------------- drivers/gpu/drm/i915/i915_perf_types.h | 5 +++++ 2 files changed, 19 insertions(+), 17 deletions(-)
drivers/gpu/drm/i915/i915_perf.c +14 -17
@@ -3231,6 +3231,7 @@ static int i915_oa_stream_init(struct i915_perf_stream *stream, stream->poll_check_timer.function = oa_poll_check_timer_cb;init_waitqueue_head (&stream->poll_wq);spin_lock_init (&stream->oa_buffer.ptr_lock); +mutex_init (&stream->lock);return 0 ;
@@ -3294,7 +3295,6 @@ static ssize_t i915_perf_read(struct file *file, loff_t *ppos) {struct i915_perf_stream *stream = file->private_data; -struct intel_gt *gt = stream->engine->gt;size_t offset =0 ;int ret;
@@ -3318,14 +3318,14 @@ static ssize_t i915_perf_read(struct file *file,if (ret)return ret; -mutex_lock (>->perf.lock); +mutex_lock (&stream->lock); ret = stream->ops->read (stream, buf, count, &offset); -mutex_unlock (>->perf.lock); +mutex_unlock (&stream->lock); }while (!offset && !ret); }else { -mutex_lock (>->perf.lock); +mutex_lock (&stream->lock); ret = stream->ops->read (stream, buf, count, &offset); -mutex_unlock (>->perf.lock); +mutex_unlock (&stream->lock); }/* We allow the poll checking to sometimes report false positive EPOLLIN
@@ -3372,9 +3372,6 @@ static enum hrtimer_restart oa_poll_check_timer_cb(struct hrtimer *hrtimer)* &i915_perf_stream_ops->poll_wait to call poll_wait() with a wait queue that * will be woken for new stream data. * -* Note: The >->perf.lock mutex has been taken to serialize -* with any non-file-operation driver hooks. -* * Returns: any poll events that are ready without sleeping */ static __poll_t i915_perf_poll_locked(struct i915_perf_stream *stream,
@@ -3413,12 +3410,11 @@ static __poll_t i915_perf_poll_locked(struct i915_perf_stream *stream,static __poll_t i915_perf_poll (struct file *file,poll_table *wait) {struct i915_perf_stream *stream = file->private_data; -struct intel_gt *gt = stream->engine->gt;__poll_t ret; -mutex_lock (>->perf.lock); +mutex_lock (&stream->lock); ret =i915_perf_poll_locked (stream, file, wait); -mutex_unlock (>->perf.lock); +mutex_unlock (&stream->lock);return ret; }
@@ -3517,9 +3513,6 @@ static long i915_perf_config_locked(struct i915_perf_stream *stream,* @cmd: the ioctl request * @arg: the ioctl data * -* Note: The >->perf.lock mutex has been taken to serialize -* with any non-file-operation driver hooks. -* * Returns: zero on success or a negative error code. Returns -EINVAL for * an unknown ioctl request. */
@@ -3557,12 +3550,11 @@ static long i915_perf_ioctl(struct file *file, unsigned long arg) {struct i915_perf_stream *stream = file->private_data; -struct intel_gt *gt = stream->engine->gt;long ret; -mutex_lock (>->perf.lock); +mutex_lock (&stream->lock); ret =i915_perf_ioctl_locked (stream, cmd, arg); -mutex_unlock (>->perf.lock); +mutex_unlock (&stream->lock);return ret; }
@@ -3608,6 +3600,11 @@ static int i915_perf_release(struct inode *inode, struct file *file)struct i915_perf *perf = stream->perf;struct intel_gt *gt = stream->engine->gt; +/* +* Within this call, we know that the fd is being closed and we have no +* other user of stream->lock. Use the perf lock to destroy the stream +* here. +*/ mutex_lock (>->perf.lock);i915_perf_destroy_locked (stream);mutex_unlock (>->perf.lock);
drivers/gpu/drm/i915/i915_perf_types.h +5 -0
@@ -146,6 +146,11 @@ struct i915_perf_stream {*/ struct intel_engine_cs *engine; +/* +* Lock associated with operations on stream +*/ +struct mutex lock; +/** * @sample_flags: Flags representing the `DRM_I915_PERF_PROP_SAMPLE_*` * properties given when opening a stream, representing the contents
Signature · 1 line
2.25.1
PATCH v5 9/16 drm/i915/perf: Use gt-specific ggtt for OA and noa-wait buffers
In reply to Umesh Nerlige RamappaUser passes uabi engine class and instance to the perf OA interface. Use gt corresponding to the engine to pin the buffers to the right ggtt.
--- drivers/gpu/drm/i915/i915_perf.c | 21 +++++++++++++++++++-- 1 file changed, 19 insertions(+), 2 deletions(-)
drivers/gpu/drm/i915/i915_perf.c +19 -2
@@ -1754,6 +1754,7 @@ static void gen12_init_oa_buffer(struct i915_perf_stream *stream)static int alloc_oa_buffer (struct i915_perf_stream *stream) {struct drm_i915_private *i915 = stream->perf->i915; +struct intel_gt *gt = stream->engine->gt;struct drm_i915_gem_object *bo;struct i915_vma *vma;int ret;
@@ -1773,11 +1774,22 @@ static int alloc_oa_buffer(struct i915_perf_stream *stream)i915_gem_object_set_cache_coherency (bo,I915_CACHE_LLC );/* PreHSW required 512K alignment, HSW requires 16M */ - vma =i915_gem_object_ggtt_pin (bo,NULL ,0 ,SZ_16M ,0 ); + vma =i915_vma_instance (bo, >->ggtt->vm,NULL );if (IS_ERR (vma)) { ret =PTR_ERR (vma); goto err_unref; } + +/* +* PreHSW required 512K alignment. +* HSW and onwards, align to requested size of OA buffer. +*/ + ret =i915_vma_pin (vma,0 ,SZ_16M ,PIN_GLOBAL |PIN_HIGH ); +if (ret) { +drm_err (>->i915->drm,"Failed to pin OA buffer %d\n" , ret); + goto err_unref; + } + stream->oa_buffer.vma = vma; stream->oa_buffer.vaddr =
@@ -1827,6 +1839,7 @@ static u32 *save_restore_register(struct i915_perf_stream *stream, u32 *cs,static int alloc_noa_wait (struct i915_perf_stream *stream) {struct drm_i915_private *i915 = stream->perf->i915; +struct intel_gt *gt = stream->engine->gt;struct drm_i915_gem_object *bo;struct i915_vma *vma; const u64 delay_ticks = 0xffffffffffffffff -
@@ -1867,12 +1880,16 @@ static int alloc_noa_wait(struct i915_perf_stream *stream)* multiple OA config BOs will have a jump to this address and it * needs to be fixed during the lifetime of the i915/perf stream. */ - vma =i915_gem_object_ggtt_pin_ww (bo, &ww,NULL ,0 ,0 ,PIN_HIGH ); + vma =i915_vma_instance (bo, >->ggtt->vm,NULL );if (IS_ERR (vma)) { ret =PTR_ERR (vma); goto out_ww; } + ret =i915_vma_pin_ww (vma, &ww,0 ,0 ,PIN_GLOBAL |PIN_HIGH ); +if (ret) + goto out_ww; + batch = cs =i915_gem_object_pin_map (bo,I915_MAP_WB );if (IS_ERR (batch)) { ret =PTR_ERR (batch);
Signature · 1 line
2.25.1
PATCH v5 10/16 drm/i915/perf: Store a pointer to oa_format in oa_buffer
In reply to Umesh Nerlige RamappaDG2 introduces OA reports with 64 bit report header fields. Perf OA would need more information about the OA format in order to process such reports. Store all OA format info in oa_buffer instead of just the size and format-id.
v2: Drop format_size variable (Ashutosh)
--- drivers/gpu/drm/i915/i915_perf.c | 30 +++++++++++--------------- drivers/gpu/drm/i915/i915_perf_types.h | 3 +-- 2 files changed, 13 insertions(+), 20 deletions(-)
drivers/gpu/drm/i915/i915_perf.c +12 -18
@@ -465,7 +465,7 @@ static u32 gen7_oa_hw_tail_read(struct i915_perf_stream *stream)static bool oa_buffer_check_unlocked (struct i915_perf_stream *stream) {u32 gtt_offset =i915_ggtt_offset (stream->oa_buffer.vma); -int report_size = stream->oa_buffer.format_size; +int report_size = stream->oa_buffer.format->size;unsigned long flags;bool pollin;u32 hw_tail;
@@ -602,7 +602,7 @@ static int append_oa_sample(struct i915_perf_stream *stream,size_t *offset, const u8 *report) { - int report_size = stream->oa_buffer.format_size; + int report_size = stream->oa_buffer.format->size;struct drm_i915_perf_record_header header; header.type =DRM_I915_PERF_RECORD_SAMPLE ;
@@ -652,7 +652,7 @@ static int gen8_append_oa_reports(struct i915_perf_stream *stream, size_t *offset) {struct intel_uncore *uncore = stream->uncore; -int report_size = stream->oa_buffer.format_size; +int report_size = stream->oa_buffer.format->size;u8 *oa_buf_base = stream->oa_buffer.vaddr;u32 gtt_offset =i915_ggtt_offset (stream->oa_buffer.vma);u32 mask = (OA_BUFFER_SIZE -1 );
@@ -945,7 +945,7 @@ static int gen7_append_oa_reports(struct i915_perf_stream *stream, size_t *offset) {struct intel_uncore *uncore = stream->uncore; -int report_size = stream->oa_buffer.format_size; +int report_size = stream->oa_buffer.format->size;u8 *oa_buf_base = stream->oa_buffer.vaddr;u32 gtt_offset =i915_ggtt_offset (stream->oa_buffer.vma);u32 mask = (OA_BUFFER_SIZE -1 );
@@ -2506,7 +2506,7 @@ static int gen12_configure_oar_context(struct i915_perf_stream *stream, {int err;struct intel_context *ce = stream->pinned_ctx; -u32 format = stream->oa_buffer.format; +u32 format = stream->oa_buffer.format->format;u32 offset = stream->perf->ctx_oactxctrl_offset;struct flex regs_context[] = { {
@@ -2877,7 +2877,7 @@ static void gen7_oa_enable(struct i915_perf_stream *stream)u32 ctx_id = stream->specific_ctx_id;bool periodic = stream->periodic;u32 period_exponent = stream->period_exponent; -u32 report_format = stream->oa_buffer.format; +u32 report_format = stream->oa_buffer.format->format;/* * Reset buf pointers so we don't forward reports from before now.
@@ -2903,7 +2903,7 @@ static void gen7_oa_enable(struct i915_perf_stream *stream)static void gen8_oa_enable (struct i915_perf_stream *stream) {struct intel_uncore *uncore = stream->uncore; -u32 report_format = stream->oa_buffer.format; +u32 report_format = stream->oa_buffer.format->format;/* * Reset buf pointers so we don't forward reports from before now.
@@ -2929,7 +2929,7 @@ static void gen8_oa_enable(struct i915_perf_stream *stream)static void gen12_oa_enable (struct i915_perf_stream *stream) {struct intel_uncore *uncore = stream->uncore; -u32 report_format = stream->oa_buffer.format; +u32 report_format = stream->oa_buffer.format->format;/* * If we don't want OA reports from the OA buffer, then we don't even
@@ -3110,7 +3110,6 @@ static int i915_oa_stream_init(struct i915_perf_stream *stream,struct drm_i915_private *i915 = stream->perf->i915;struct i915_perf *perf = stream->perf;struct intel_gt *gt; -int format_size;int ret;if (!props->engine) {
@@ -3166,20 +3165,15 @@ static int i915_oa_stream_init(struct i915_perf_stream *stream, stream->sample_size =sizeof (struct drm_i915_perf_record_header ); - format_size = perf->oa_formats[props->oa_format].size; + stream->oa_buffer.format = &perf->oa_formats[props->oa_format]; +if (drm_WARN_ON (&i915->drm, stream->oa_buffer.format->size ==0 )) +return -EINVAL ; stream->sample_flags = props->sample_flags; - stream->sample_size += format_size; - - stream->oa_buffer.format_size = format_size; -if (drm_WARN_ON (&i915->drm, stream->oa_buffer.format_size ==0 )) -return -EINVAL ; + stream->sample_size += stream->oa_buffer.format->size; stream->hold_preemption = props->hold_preemption; - stream->oa_buffer.format = - perf->oa_formats[props->oa_format].format; - stream->periodic = props->oa_periodic;if (stream->periodic) stream->period_exponent = props->oa_period_exponent;
drivers/gpu/drm/i915/i915_perf_types.h +1 -2
@@ -250,11 +250,10 @@ struct i915_perf_stream {* @oa_buffer: State of the OA buffer. */ struct { +const struct i915_oa_format *format;struct i915_vma *vma;u8 *vaddr;u32 last_ctx_id; -int format; -int format_size;int size_exponent;/**
Signature · 1 line
2.25.1
PATCH v5 11/16 drm/i915/perf: Add Wa_1508761755:dg2
In reply to Umesh Nerlige RamappaDisable Clock gating in EU when gathering the events so that EU events are not lost.
v2: Fix checkpatch issues
v3: User MCR helpers to write to MC reg
--- drivers/gpu/drm/i915/gt/intel_gt_regs.h | 1 + drivers/gpu/drm/i915/i915_perf.c | 24 ++++++++++++++++++++++++ 2 files changed, 25 insertions(+)
drivers/gpu/drm/i915/gt/intel_gt_regs.h +1 -0
@@ -1164,6 +1164,7 @@#define GEN12_DISABLE_EARLY_READ REG_BIT(14)#define GEN12_ENABLE_LARGE_GRF_MODE REG_BIT(12)#define GEN12_PUSH_CONST_DEREF_HOLD_DIS REG_BIT(8) +#define GEN12_DISABLE_DOP_GATING REG_BIT(0)#define RT_CTRL MCR_REG(0xe530)#define DIS_NULL_QUERY REG_BIT(10)
drivers/gpu/drm/i915/i915_perf.c +24 -0
@@ -204,6 +204,7 @@#include "gt/intel_gpu_commands.h" #include "gt/intel_gt.h" #include "gt/intel_gt_clock_utils.h" +#include "gt/intel_gt_mcr.h" #include "gt/intel_gt_regs.h" #include "gt/intel_lrc.h" #include "gt/intel_lrc_reg.h"
@@ -2775,6 +2776,18 @@ gen12_enable_metric_set(struct i915_perf_stream *stream,u32 sqcnt1;int ret; +/* +* Wa_1508761755:xehpsdv, dg2 +* EU NOA signals behave incorrectly if EU clock gating is enabled. +* Disable thread stall DOP gating and EU DOP gating. +*/ +if (IS_XEHPSDV (i915) ||IS_DG2 (i915)) { +intel_gt_mcr_multicast_write (uncore->gt,GEN8_ROW_CHICKEN , +_MASKED_BIT_ENABLE (STALL_DOP_GATING_DISABLE )); +intel_uncore_write (uncore,GEN7_ROW_CHICKEN2 , +_MASKED_BIT_ENABLE (GEN12_DISABLE_DOP_GATING )); + } + intel_uncore_write(uncore, GEN12_OAG_OA_DEBUG, /* Disable clk ratio reports, like previous Gens. */ _MASKED_BIT_ENABLE(GEN12_OAG_OA_DEBUG_DISABLE_CLK_RATIO_REPORTS |
@@ -2853,6 +2866,17 @@ static void gen12_disable_metric_set(struct i915_perf_stream *stream)struct drm_i915_private *i915 = stream->perf->i915;u32 sqcnt1; +/* +* Wa_1508761755:xehpsdv, dg2 +* Enable thread stall DOP gating and EU DOP gating. +*/ +if (IS_XEHPSDV (i915) ||IS_DG2 (i915)) { +intel_gt_mcr_multicast_write (uncore->gt,GEN8_ROW_CHICKEN , +_MASKED_BIT_DISABLE (STALL_DOP_GATING_DISABLE )); +intel_uncore_write (uncore,GEN7_ROW_CHICKEN2 , +_MASKED_BIT_DISABLE (GEN12_DISABLE_DOP_GATING )); + } +/* Reset all contexts' slices/subslices configurations. */ gen12_configure_all_contexts (stream,NULL ,NULL );
Signature · 1 line
2.25.1
PATCH v5 12/16 drm/i915/perf: Apply Wa_18013179988
In reply to Umesh Nerlige RamappaOA reports in the OA buffer contain an OA timestamp field that helps user calculate delta between 2 OA reports. The calculation relies on the CS timestamp frequency to convert the timestamp value to nanoseconds. The CS timestamp frequency is a function of the CTC_SHIFT value in RPM_CONFIG0.
In DG2, OA unit assumes that the CTC_SHIFT is 3, instead of using the actual value from RPM_CONFIG0. At the user level, this results in an error in calculating delta between 2 OA reports since the OA timestamp is not shifted in the same manner as CS timestamp. Also the periodicity of the reports is different from what the user configured because of mismatch in the CS and OA frequencies.
The issue also affects MI_REPORT_PERF_COUNT command.
To resolve this, return actual OA timestamp frequency to the user in i915_getparam_ioctl, so that user can calculate the right OA exponent as well as interpret the reports correctly.
MR: https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/18893
v2:
- Use REG_FIELD_GET (Ashutosh)
- Update commit msg
--- drivers/gpu/drm/i915/i915_getparam.c | 3 +++ drivers/gpu/drm/i915/i915_perf.c | 30 ++++++++++++++++++++++++++-- drivers/gpu/drm/i915/i915_perf.h | 2 ++ include/uapi/drm/i915_drm.h | 6 ++++++ 4 files changed, 39 insertions(+), 2 deletions(-)
drivers/gpu/drm/i915/i915_getparam.c +3 -0
@@ -175,6 +175,9 @@ int i915_getparam_ioctl(struct drm_device *dev, void *data,case I915_PARAM_PERF_REVISION : value =i915_perf_ioctl_version ();break ; +case I915_PARAM_OA_TIMESTAMP_FREQUENCY : + value =i915_perf_oa_timestamp_frequency (i915); +break ;default :DRM_DEBUG ("Unknown parameter %d\n" , param->param);return -EINVAL ;
drivers/gpu/drm/i915/i915_perf.c +28 -2
@@ -3109,6 +3109,30 @@ get_sseu_config(struct intel_sseu *out_sseu,return i915_gem_user_to_context_sseu (engine->gt, drm_sseu, out_sseu); } +/* +* OA timestamp frequency = CS timestamp frequency in most platforms. On some +* platforms OA unit ignores the CTC_SHIFT and the 2 timestamps differ. In such +* cases, return the adjusted CS timestamp frequency to the user. +*/ +u32 i915_perf_oa_timestamp_frequency (struct drm_i915_private *i915) +{ +/* Wa_18013179988:dg2 */ +if (IS_DG2 (i915)) { +intel_wakeref_t wakeref; +u32 reg, shift; + +with_intel_runtime_pm (to_gt (i915)->uncore->rpm, wakeref) + reg = intel_uncore_read(to_gt(i915)->uncore, RPM_CONFIG0); + + shift =REG_FIELD_GET (GEN10_RPM_CONFIG0_CTC_SHIFT_PARAMETER_MASK , + reg); + +return to_gt (i915)->clock_frequency << (3 - shift); + } + +return to_gt (i915)->clock_frequency; +} +/** * i915_oa_stream_init - validate combined props for OA stream and init * @stream: An i915 perf stream
@@ -3830,8 +3854,10 @@ i915_perf_open_ioctl_locked(struct i915_perf *perf,static u64 oa_exponent_to_ns (struct i915_perf *perf,int exponent) { -return intel_gt_clock_interval_to_ns (to_gt (perf->i915), -2ULL << exponent); +u64 nom = (2ULL << exponent) *NSEC_PER_SEC ; +u32 den =i915_perf_oa_timestamp_frequency (perf->i915); + +return div_u64 (nom + den -1 , den); }static __always_inline bool
drivers/gpu/drm/i915/i915_perf.h +2 -0
@@ -57,4 +57,6 @@ static inline void i915_oa_config_put(struct i915_oa_config *oa_config) kref_put(&oa_config->ref, i915_oa_config_release); } +u32 i915_perf_oa_timestamp_frequency (struct drm_i915_private *i915); +#endif /* __I915_PERF_H__ */
include/uapi/drm/i915_drm.h +6 -0
@@ -765,6 +765,12 @@ typedef struct drm_i915_irq_wait {/* Query if the kernel supports the I915_USERPTR_PROBE flag. */ #define I915_PARAM_HAS_USERPTR_PROBE 56 +/* +* Frequency of the timestamps in OA reports. This used to be the same as the CS +* timestamp frequency, but differs on some platforms. +*/ +#define I915_PARAM_OA_TIMESTAMP_FREQUENCY 57 +/* Must be kept compact -- no holes and well documented */ /**
Signature · 1 line
2.25.1
PATCH v5 13/16 drm/i915/perf: Save/restore EU flex counters across reset
In reply to Umesh Nerlige RamappaIf a drm client is killed, then hw contexts used by the client are reset immediately. This reset clears the EU flex counter configuration. If an OA use case is running in parallel, it would start seeing zeroed eu counter values following the reset even if the drm client is restarted. Save/restore the EU flex counter config so that the EU counters can be monitored continuously across resets.
v2:
- Save/restore eu flex config only for gen12, as for pre-gen12, these are saved and restored in the context image.
--- drivers/gpu/drm/i915/gt/uc/intel_guc_ads.c | 10 ++++++++++ 1 file changed, 10 insertions(+)
drivers/gpu/drm/i915/gt/uc/intel_guc_ads.c +10 -0
@@ -392,6 +392,16 @@ static int guc_mmio_regset_init(struct temp_regset *regset,else ret |=GUC_MMIO_REG_ADD (gt, regset,GEN9_LNCFCMOCS (i), false); +if (GRAPHICS_VER (engine->i915) >=12 ) { + ret |=GUC_MMIO_REG_ADD (gt, regset,EU_PERF_CNTL0 , false); + ret |=GUC_MMIO_REG_ADD (gt, regset,EU_PERF_CNTL1 , false); + ret |=GUC_MMIO_REG_ADD (gt, regset,EU_PERF_CNTL2 , false); + ret |=GUC_MMIO_REG_ADD (gt, regset,EU_PERF_CNTL3 , false); + ret |=GUC_MMIO_REG_ADD (gt, regset,EU_PERF_CNTL4 , false); + ret |=GUC_MMIO_REG_ADD (gt, regset,EU_PERF_CNTL5 , false); + ret |=GUC_MMIO_REG_ADD (gt, regset,EU_PERF_CNTL6 , false); + } +return ret ?-1 :0 ; }
Signature · 1 line
2.25.1
PATCH v5 14/16 drm/i915/guc: Support OA when Wa_16011777198 is enabled
In reply to Umesh Nerlige RamappaFrom: Vinay Belgaumkar <[email protected]>
On DG2, a w/a resets RCS/CCS before it goes into RC6. This breaks OA since OA does not expect engine resets during its use. Fix it by disabling RC6.
v2: (Ashutosh)
- Bring back slpc_unset_param helper
- Update commit msg
- Use with_intel_runtime_pm helper for set/unset
v3: (Ashutosh)
- Just use intel_uc_uses_guc_rc
--- .../drm/i915/gt/uc/abi/guc_actions_slpc_abi.h | 9 +++ drivers/gpu/drm/i915/gt/uc/intel_guc_slpc.c | 66 +++++++++++++++++++ drivers/gpu/drm/i915/gt/uc/intel_guc_slpc.h | 2 + drivers/gpu/drm/i915/i915_perf.c | 27 ++++++++ 4 files changed, 104 insertions(+)
drivers/gpu/drm/i915/gt/uc/abi/guc_actions_slpc_abi.h +9 -0
@@ -128,6 +128,15 @@ enum slpc_media_ratio_mode { SLPC_MEDIA_RATIO_MODE_FIXED_ONE_TO_TWO = 2, }; +enum slpc_gucrc_mode { +SLPC_GUCRC_MODE_HW =0 , +SLPC_GUCRC_MODE_GUCRC_NO_RC6 =1 , +SLPC_GUCRC_MODE_GUCRC_STATIC_TIMEOUT =2 , +SLPC_GUCRC_MODE_GUCRC_DYNAMIC_HYSTERESIS =3 , + +SLPC_GUCRC_MODE_MAX , +}; +enum slpc_event_id {SLPC_EVENT_RESET =0 ,SLPC_EVENT_SHUTDOWN =1 ,
drivers/gpu/drm/i915/gt/uc/intel_guc_slpc.c +66 -0
84 lines not on this page · raw message
drivers/gpu/drm/i915/gt/uc/intel_guc_slpc.h +2 -0
@@ -42,5 +42,7 @@ int intel_guc_slpc_set_media_ratio_mode(struct intel_guc_slpc *slpc, u32 val);void intel_guc_pm_intrmsk_enable (struct intel_gt *gt);void intel_guc_slpc_boost (struct intel_guc_slpc *slpc);void intel_guc_slpc_dec_waiters (struct intel_guc_slpc *slpc); +int intel_guc_slpc_unset_gucrc_mode (struct intel_guc_slpc *slpc); +int intel_guc_slpc_override_gucrc_mode (struct intel_guc_slpc *slpc,u32 mode);#endif
drivers/gpu/drm/i915/i915_perf.c +27 -0
@@ -209,6 +209,7 @@#include "gt/intel_lrc.h" #include "gt/intel_lrc_reg.h" #include "gt/intel_ring.h" +#include "gt/uc/intel_guc_slpc.h" #include "i915_drv.h" #include "i915_file_private.h"
@@ -1582,6 +1583,15 @@ static void i915_oa_stream_destroy(struct i915_perf_stream *stream)free_oa_buffer (stream); +/* +* Wa_16011777198:dg2: Unset the override of GUCRC mode to enable rc6. +*/ +if (intel_uc_uses_guc_rc (>->uc) && + (IS_DG2_GRAPHICS_STEP (gt->i915,G10 ,STEP_A0 ,STEP_C0 ) || +IS_DG2_GRAPHICS_STEP (gt->i915,G11 ,STEP_A0 ,STEP_B0 ))) +drm_WARN_ON (>->i915->drm, +intel_guc_slpc_unset_gucrc_mode (>->uc.guc.slpc)); +intel_uncore_forcewake_put (stream->uncore,FORCEWAKE_ALL );intel_engine_pm_put (stream->engine);
@@ -3265,6 +3275,23 @@ static int i915_oa_stream_init(struct i915_perf_stream *stream,intel_engine_pm_get (stream->engine);intel_uncore_forcewake_get (stream->uncore,FORCEWAKE_ALL ); +/* +* Wa_16011777198:dg2: GuC resets render as part of the Wa. This causes +* OA to lose the configuration state. Prevent this by overriding GUCRC +* mode. +*/ +if (intel_uc_uses_guc_rc (>->uc) && + (IS_DG2_GRAPHICS_STEP (gt->i915,G10 ,STEP_A0 ,STEP_C0 ) || +IS_DG2_GRAPHICS_STEP (gt->i915,G11 ,STEP_A0 ,STEP_B0 ))) { + ret =intel_guc_slpc_override_gucrc_mode (>->uc.guc.slpc, +SLPC_GUCRC_MODE_GUCRC_NO_RC6 ); +if (ret) { +drm_dbg (&stream->perf->i915->drm, +"Unable to override gucrc mode\n" ); + goto err_config; + } + } + ret =alloc_oa_buffer (stream);if (ret) goto err_oa_buf_alloc;
Signature · 1 line
2.25.1
PATCH v5 15/16 drm/i915/perf: complete programming whitelisting for XEHPSDV
In reply to Umesh Nerlige RamappaFrom: Lionel Landwerlin <[email protected]>
We have an additional register to select which slices contribute to OAG/OAG counter increments.
--- drivers/gpu/drm/i915/i915_drv.h | 2 ++ drivers/gpu/drm/i915/i915_pci.c | 1 + drivers/gpu/drm/i915/i915_perf.c | 13 +++++++++++++ drivers/gpu/drm/i915/intel_device_info.h | 1 + 4 files changed, 17 insertions(+)
drivers/gpu/drm/i915/i915_drv.h +2 -0
@@ -900,6 +900,8 @@ IS_SUBPLATFORM(const struct drm_i915_private *i915,#define HAS_OA_BPC_REPORTING (dev_priv) \ (INTEL_INFO(dev_priv)->has_oa_bpc_reporting) +#define HAS_OA_SLICE_CONTRIB_LIMITS (dev_priv) \ + (INTEL_INFO(dev_priv)->has_oa_slice_contrib_limits)/* * Set this flag, when platform requires 64K GTT page sizes or larger for
drivers/gpu/drm/i915/i915_pci.c +1 -0
@@ -1024,6 +1024,7 @@ static const struct intel_device_info adl_p_info = { .has_logical_ring_elsq = 1, \ .has_mslice_steering = 1, \ .has_oa_bpc_reporting = 1, \ + .has_oa_slice_contrib_limits = 1, \ .has_rc6 = 1, \ .has_reset_engine = 1, \ .has_rps = 1, \
drivers/gpu/drm/i915/i915_perf.c +13 -0
@@ -4261,6 +4261,11 @@ static const struct i915_range gen12_oa_b_counters[] = { {} }; +static const struct i915_range xehp_oa_b_counters[] = { + { .start =0xdc48 , .end =0xdc48 },/* OAA_ENABLE_REG */ + { .start =0xdd00 , .end =0xdd48 },/* OAG_LCE0_0 - OAA_LENABLE_REG */ +}; +static const struct i915_range gen7_oa_mux_regs[] = { { .start =0x91b8 , .end =0x91cc },/* OA_PERFCNT[1-2], OA_PERFMATRIX */ { .start =0x9800 , .end =0x9888 },/* MICRO_BP0_0 - NOA_WRITE */
@@ -4335,6 +4340,12 @@ static bool gen12_is_valid_b_counter_addr(struct i915_perf *perf, u32 addr)return reg_in_range_table (addr, gen12_oa_b_counters); } +static bool xehp_is_valid_b_counter_addr (struct i915_perf *perf,u32 addr) +{ +return reg_in_range_table (addr, xehp_oa_b_counters) || +reg_in_range_table (addr, gen12_oa_b_counters); +} +static bool gen12_is_valid_mux_addr (struct i915_perf *perf,u32 addr) {return reg_in_range_table (addr, gen12_oa_mux_regs);
@@ -4847,6 +4858,8 @@ void i915_perf_init(struct drm_i915_private *i915) perf->ops.oa_hw_tail_read = gen8_oa_hw_tail_read; }else if (GRAPHICS_VER (i915) ==12 ) { perf->ops.is_valid_b_counter_reg = +HAS_OA_SLICE_CONTRIB_LIMITS (i915) ? + xehp_is_valid_b_counter_addr : gen12_is_valid_b_counter_addr; perf->ops.is_valid_mux_reg = gen12_is_valid_mux_addr;
drivers/gpu/drm/i915/intel_device_info.h +1 -0
@@ -165,6 +165,7 @@ enum intel_ppgtt_type {func (has_media_ratio_mode); \func (has_mslice_steering); \func (has_oa_bpc_reporting); \ +func (has_oa_slice_contrib_limits); \func (has_one_eu_per_fuse_bit); \func (has_pxp); \func (has_rc6); \
Signature · 1 line
2.25.1
PATCH v5 16/16 drm/i915/perf: Enable OA for DG2
In reply to Umesh Nerlige RamappaOA was disabled for DG2 as support was missing. Enable it back now.
--- drivers/gpu/drm/i915/i915_perf.c | 6 ------ 1 file changed, 6 deletions(-)
drivers/gpu/drm/i915/i915_perf.c +0 -6
@@ -4798,12 +4798,6 @@ void i915_perf_init(struct drm_i915_private *i915) {struct i915_perf *perf = &i915->perf; -/* XXX const struct i915_perf_ops! */ - -/* i915_perf is not enabled for DG2 yet */ -if (IS_DG2 (i915)) -return ; - perf->oa_formats = oa_formats;if (IS_HASWELL (i915)) { perf->ops.is_valid_b_counter_reg = gen7_is_valid_b_counter_addr;
Signature · 1 line
2.25.1
Patchwork
CI[Intel-gfx] ✗ Fi.CI.CHECKPATCH: warning for Add DG2 OA support (rev8)
In reply to Umesh Nerlige Ramappa== Series Details ==
== Series Details ==
Series: Add DG2 OA support (rev8)
URL : https://patchwork.freedesktop.org/series/107584/
State : warning
== Summary ==
Error: dim checkpatch failed0bf14cf6597e drm/i915/perf: Fix OA filtering logic for GuC mode dfe2d19762a0 drm/i915/perf: Add 32-bit OAG and OAR formats for DG2 d315bb1f4f02 drm/i915/perf: Fix noa wait predication for DG2 909fd2f2dbb4 drm/i915/perf: Determine gen12 oa ctx offset at runtime 212e98fbb19e drm/i915/perf: Enable bytes per clock reporting in OA 6c1e44b8ee86 drm/i915/perf: Simply use stream->ctxd6ad777f12c6 drm/i915/perf: Move gt-specific data from i915->perf to gt->perf 4f2b61f0f0c5 drm/i915/perf: Replace gt->perf.lock with stream->lock for file ops 341cd0a92c2d drm/i915/perf: Use gt-specific ggtt for OA and noa-wait buffers 01cbb5248b04 drm/i915/perf: Store a pointer to oa_format in oa_buffer 1ba7b62c013d drm/i915/perf: Add Wa_1508761755:dg2
-:50: CHECK:PARENTHESIS_ALIGNMENT: Alignment should match open parenthesis #50: FILE: drivers/gpu/drm/i915/i915_perf.c:2786:
+ intel_gt_mcr_multicast_write(uncore->gt, GEN8_ROW_CHICKEN,
+ _MASKED_BIT_ENABLE(STALL_DOP_GATING_DISABLE));
-:68: CHECK:PARENTHESIS_ALIGNMENT: Alignment should match open parenthesis #68: FILE: drivers/gpu/drm/i915/i915_perf.c:2875:
+ intel_gt_mcr_multicast_write(uncore->gt, GEN8_ROW_CHICKEN,
+ _MASKED_BIT_DISABLE(STALL_DOP_GATING_DISABLE));
total: 0 errors, 0 warnings, 2 checks, 49 lines checked21597a2d5558 drm/i915/perf: Apply Wa_18013179988c27db74ba252 drm/i915/perf: Save/restore EU flex counters across resetc016fd4fd563 drm/i915/guc: Support OA when Wa_16011777198 is enabled
-:72: WARNING:AVOID_BUG: Do not crash the kernel unless it is absolutely unavoidable--use WARN_ON_ONCE() plus recovery code (if feasible) instead of BUG() or variants #72: FILE: drivers/gpu/drm/i915/gt/uc/intel_guc_slpc.c:208:
+ GEM_BUG_ON(id >= SLPC_MAX_PARAM);
total: 0 errors, 1 warnings, 0 checks, 151 lines checked 8620f1d6a324 drm/i915/perf: complete programming whitelisting for XEHPSDV c26a47fd0a86 drm/i915/perf: Enable OA for DG2
Patchwork
CI[Intel-gfx] ✗ Fi.CI.SPARSE: warning for Add DG2 OA support (rev8)
In reply to Umesh Nerlige Ramappa== Series Details ==
== Series Details ==
Series: Add DG2 OA support (rev8)
URL : https://patchwork.freedesktop.org/series/107584/
State : warning
== Summary ==
Error: dim sparse failed
Sparse version: v0.6.2
Fast mode used, each commit won't be checked separately.
Patchwork
CI[Intel-gfx] ✗ Fi.CI.CHECKPATCH: warning for Add DG2 OA support (rev9)
In reply to Umesh Nerlige Ramappa== Series Details ==
== Series Details ==
Series: Add DG2 OA support (rev9)
URL : https://patchwork.freedesktop.org/series/107584/
State : warning
== Summary ==
Error: dim checkpatch failed54115be03fa0 drm/i915/perf: Fix OA filtering logic for GuC mode 404934d8ea75 drm/i915/perf: Add 32-bit OAG and OAR formats for DG2 9a598c2db261 drm/i915/perf: Fix noa wait predication for DG2 e83966c3605c drm/i915/perf: Determine gen12 oa ctx offset at runtime 3a4c4669e1e9 drm/i915/perf: Enable bytes per clock reporting in OA f775a29f0ddb drm/i915/perf: Simply use stream->ctx14a0fc5d05f8 drm/i915/perf: Move gt-specific data from i915->perf to gt->perf 420d8fd75520 drm/i915/perf: Replace gt->perf.lock with stream->lock for file ops 3a25300ef298 drm/i915/perf: Use gt-specific ggtt for OA and noa-wait buffers 6a13b862990c drm/i915/perf: Store a pointer to oa_format in oa_buffer 6a0eaaaba26e drm/i915/perf: Add Wa_1508761755:dg2
-:50: CHECK:PARENTHESIS_ALIGNMENT: Alignment should match open parenthesis #50: FILE: drivers/gpu/drm/i915/i915_perf.c:2786:
+ intel_gt_mcr_multicast_write(uncore->gt, GEN8_ROW_CHICKEN,
+ _MASKED_BIT_ENABLE(STALL_DOP_GATING_DISABLE));
-:68: CHECK:PARENTHESIS_ALIGNMENT: Alignment should match open parenthesis #68: FILE: drivers/gpu/drm/i915/i915_perf.c:2875:
+ intel_gt_mcr_multicast_write(uncore->gt, GEN8_ROW_CHICKEN,
+ _MASKED_BIT_DISABLE(STALL_DOP_GATING_DISABLE));
total: 0 errors, 0 warnings, 2 checks, 49 lines checkede4da55d0d0d2 drm/i915/perf: Apply Wa_180131799884e7986c01e01 drm/i915/perf: Save/restore EU flex counters across reset3b8c0868da47 drm/i915/guc: Support OA when Wa_16011777198 is enabled
-:72: WARNING:AVOID_BUG: Do not crash the kernel unless it is absolutely unavoidable--use WARN_ON_ONCE() plus recovery code (if feasible) instead of BUG() or variants #72: FILE: drivers/gpu/drm/i915/gt/uc/intel_guc_slpc.c:208:
+ GEM_BUG_ON(id >= SLPC_MAX_PARAM);
total: 0 errors, 1 warnings, 0 checks, 151 lines checked ad89eb9e92a8 drm/i915/perf: complete programming whitelisting for XEHPSDV b4439ae1b43d drm/i915/perf: Enable OA for DG2
Patchwork
CI[Intel-gfx] ✗ Fi.CI.SPARSE: warning for Add DG2 OA support (rev9)
In reply to Umesh Nerlige Ramappa== Series Details ==
== Series Details ==
Series: Add DG2 OA support (rev9)
URL : https://patchwork.freedesktop.org/series/107584/
State : warning
== Summary ==
Error: dim sparse failed
Sparse version: v0.6.2
Fast mode used, each commit won't be checked separately.