From: Lionel Landwerlin <lionel.g.landwerlin@intel.com>
To: Umesh Nerlige Ramappa <umesh.nerlige.ramappa@intel.com>,
<intel-gfx@lists.freedesktop.org>
Subject: Re: [Intel-gfx] [PATCH 11/19] drm/i915/perf: Store a pointer to oa_format in oa_buffer
Date: Tue, 6 Sep 2022 22:56:38 +0300 [thread overview]
Message-ID: <4130d4bc-af09-21aa-e60b-73b0f5f18515@intel.com> (raw)
In-Reply-To: <20220823204155.8178-12-umesh.nerlige.ramappa@intel.com>
On 23/08/2022 23:41, Umesh Nerlige Ramappa wrote:
> DG2 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.
>
> Signed-off-by: Umesh Nerlige Ramappa <umesh.nerlige.ramappa@intel.com>
Reviewed-by: Lionel Landwerlin <lionel.g.landwerlin@intel.com>
> ---
> drivers/gpu/drm/i915/i915_perf.c | 23 ++++++++++-------------
> drivers/gpu/drm/i915/i915_perf_types.h | 3 +--
> 2 files changed, 11 insertions(+), 15 deletions(-)
>
> diff --git a/drivers/gpu/drm/i915/i915_perf.c b/drivers/gpu/drm/i915/i915_perf.c
> index f7621b45966c..9e455bd3bce5 100644
> --- a/drivers/gpu/drm/i915/i915_perf.c
> +++ b/drivers/gpu/drm/i915/i915_perf.c
> @@ -483,7 +483,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;
> @@ -630,7 +630,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;
> int report_size_partial;
> u8 *oa_buf_end;
> @@ -694,7 +694,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);
> size_t start_offset = *offset;
> @@ -970,7 +970,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);
> @@ -2517,7 +2517,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[] = {
> {
> @@ -2890,7 +2890,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.
> @@ -2916,7 +2916,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.
> @@ -2942,7 +2942,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
> @@ -3184,15 +3184,12 @@ static int i915_oa_stream_init(struct i915_perf_stream *stream,
> 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))
> + 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->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;
> diff --git a/drivers/gpu/drm/i915/i915_perf_types.h b/drivers/gpu/drm/i915/i915_perf_types.h
> index dc9bfd8086cf..e0c96b44eda8 100644
> --- a/drivers/gpu/drm/i915/i915_perf_types.h
> +++ b/drivers/gpu/drm/i915/i915_perf_types.h
> @@ -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;
>
> /**
next prev parent reply other threads:[~2022-09-06 19:57 UTC|newest]
Thread overview: 84+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-08-23 20:41 [Intel-gfx] [PATCH 00/19] Add DG2 OA support Umesh Nerlige Ramappa
2022-08-23 20:41 ` [Intel-gfx] [PATCH 01/19] drm/i915/perf: Fix OA filtering logic for GuC mode Umesh Nerlige Ramappa
2022-09-06 14:33 ` Lionel Landwerlin
2022-09-06 17:39 ` Umesh Nerlige Ramappa
2022-09-06 18:39 ` Lionel Landwerlin
2022-09-14 22:26 ` Umesh Nerlige Ramappa
2022-09-14 23:13 ` Umesh Nerlige Ramappa
2022-09-15 22:49 ` Umesh Nerlige Ramappa
2022-09-20 3:22 ` Dixit, Ashutosh
2022-09-22 3:51 ` Dixit, Ashutosh
2022-09-22 11:05 ` Lionel Landwerlin
2022-09-09 23:47 ` Dixit, Ashutosh
2022-09-13 3:08 ` Dixit, Ashutosh
2022-09-14 23:37 ` Umesh Nerlige Ramappa
2022-09-14 23:36 ` Umesh Nerlige Ramappa
2022-09-22 3:44 ` Dixit, Ashutosh
2022-09-22 3:49 ` Dixit, Ashutosh
2022-08-23 20:41 ` [Intel-gfx] [PATCH 02/19] drm/i915/perf: Add OA formats for DG2 Umesh Nerlige Ramappa
2022-09-06 19:35 ` Lionel Landwerlin
2022-09-06 19:46 ` Umesh Nerlige Ramappa
2022-09-06 19:59 ` Lionel Landwerlin
2022-09-13 15:40 ` Dixit, Ashutosh
2022-09-14 20:54 ` Umesh Nerlige Ramappa
2022-09-14 21:16 ` Dixit, Ashutosh
2022-08-23 20:41 ` [Intel-gfx] [PATCH 03/19] drm/i915/perf: Fix noa wait predication " Umesh Nerlige Ramappa
2022-09-20 0:35 ` Dixit, Ashutosh
2022-08-23 20:41 ` [Intel-gfx] [PATCH 04/19] drm/i915/perf: Determine gen12 oa ctx offset at runtime Umesh Nerlige Ramappa
2022-09-06 19:48 ` Lionel Landwerlin
2022-09-06 20:35 ` Umesh Nerlige Ramappa
2022-09-08 18:32 ` Lionel Landwerlin
2022-09-08 23:04 ` Umesh Nerlige Ramappa
2022-08-23 20:41 ` [Intel-gfx] [PATCH 05/19] drm/i915/perf: Enable commands per clock reporting in OA Umesh Nerlige Ramappa
2022-09-06 19:51 ` Lionel Landwerlin
2022-09-14 0:19 ` Dixit, Ashutosh
2022-09-15 0:04 ` Umesh Nerlige Ramappa
2022-08-23 20:41 ` [Intel-gfx] [PATCH 06/19] drm/i915/perf: Use helpers to process reports w.r.t. OA buffer size Umesh Nerlige Ramappa
2022-09-14 16:04 ` Dixit, Ashutosh
2022-09-14 18:19 ` Umesh Nerlige Ramappa
2022-09-14 19:07 ` Dixit, Ashutosh
2022-08-23 20:41 ` [Intel-gfx] [PATCH 07/19] drm/i915/perf: Simply use stream->ctx Umesh Nerlige Ramappa
2022-09-06 19:52 ` Lionel Landwerlin
2022-08-23 20:41 ` [Intel-gfx] [PATCH 08/19] drm/i915/perf: Move gt-specific data from i915->perf to gt->perf Umesh Nerlige Ramappa
2022-09-06 19:54 ` Lionel Landwerlin
2022-09-14 18:20 ` Dixit, Ashutosh
2022-08-23 20:41 ` [Intel-gfx] [PATCH 09/19] drm/i915/perf: Replace gt->perf.lock with stream->lock for file ops Umesh Nerlige Ramappa
2022-09-14 19:04 ` Dixit, Ashutosh
2022-08-23 20:41 ` [Intel-gfx] [PATCH 10/19] drm/i915/perf: Use gt-specific ggtt for OA and noa-wait buffers Umesh Nerlige Ramappa
2022-09-06 19:56 ` Lionel Landwerlin
2022-09-06 20:28 ` Umesh Nerlige Ramappa
2022-09-06 20:31 ` Lionel Landwerlin
2022-08-23 20:41 ` [Intel-gfx] [PATCH 11/19] drm/i915/perf: Store a pointer to oa_format in oa_buffer Umesh Nerlige Ramappa
2022-09-06 19:56 ` Lionel Landwerlin [this message]
2022-09-14 20:43 ` Dixit, Ashutosh
2022-08-23 20:41 ` [Intel-gfx] [PATCH 12/19] drm/i915/perf: Parse 64bit report header formats correctly Umesh Nerlige Ramappa
2022-09-16 0:47 ` Dixit, Ashutosh
2022-08-23 20:41 ` [Intel-gfx] [PATCH 13/19] drm/i915/perf: Add Wa_16010703925:dg2 Umesh Nerlige Ramappa
2022-09-16 1:08 ` Dixit, Ashutosh
2022-08-23 20:41 ` [Intel-gfx] [PATCH 14/19] drm/i915/perf: Add Wa_1608133521:dg2 Umesh Nerlige Ramappa
2022-08-29 14:04 ` Jani Nikula
2022-09-16 1:21 ` Dixit, Ashutosh
2022-09-16 18:19 ` Umesh Nerlige Ramappa
2022-08-23 20:41 ` [Intel-gfx] [PATCH 15/19] drm/i915/perf: Add Wa_1508761755:dg2 Umesh Nerlige Ramappa
2022-09-16 1:34 ` Dixit, Ashutosh
2022-08-23 20:41 ` [Intel-gfx] [PATCH 16/19] drm/i915/perf: Apply Wa_18013179988 Umesh Nerlige Ramappa
2022-09-16 5:16 ` Dixit, Ashutosh
2022-09-16 15:22 ` Dixit, Ashutosh
2022-09-16 19:04 ` Umesh Nerlige Ramappa
2022-09-16 18:56 ` Umesh Nerlige Ramappa
2022-09-16 19:57 ` Dixit, Ashutosh
2022-09-16 20:25 ` Umesh Nerlige Ramappa
2022-09-16 21:00 ` Dixit, Ashutosh
2022-09-19 21:21 ` Umesh Nerlige Ramappa
2022-09-20 1:24 ` Dixit, Ashutosh
2022-08-23 20:41 ` [Intel-gfx] [PATCH 17/19] drm/i915/perf: Save/restore EU flex counters across reset Umesh Nerlige Ramappa
2022-09-16 5:40 ` Dixit, Ashutosh
2022-08-23 20:41 ` [Intel-gfx] [PATCH 18/19] drm/i915/guc: Support OA when Wa_16011777198 is enabled Umesh Nerlige Ramappa
2022-09-16 21:41 ` Dixit, Ashutosh
2022-09-16 21:48 ` Umesh Nerlige Ramappa
2022-08-23 20:41 ` [Intel-gfx] [PATCH 19/19] drm/i915/perf: Enable OA for DG2 Umesh Nerlige Ramappa
2022-08-23 21:11 ` [Intel-gfx] [PATCH 02/19] drm/i915/perf: Add OA formats " Umesh Nerlige Ramappa
2022-08-23 21:12 ` [Intel-gfx] [PATCH 19/19] drm/i915/perf: Enable OA " Umesh Nerlige Ramappa
2022-08-23 22:07 ` [Intel-gfx] ✗ Fi.CI.CHECKPATCH: warning for Add DG2 OA support (rev2) Patchwork
2022-08-23 22:07 ` [Intel-gfx] ✗ Fi.CI.SPARSE: " Patchwork
-- strict thread matches above, loose matches on Subject: below --
2022-08-23 0:03 [Intel-gfx] [PATCH 00/19] Add DG2 OA support Umesh Nerlige Ramappa
2022-08-23 0:03 ` [Intel-gfx] [PATCH 11/19] drm/i915/perf: Store a pointer to oa_format in oa_buffer Umesh Nerlige Ramappa
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=4130d4bc-af09-21aa-e60b-73b0f5f18515@intel.com \
--to=lionel.g.landwerlin@intel.com \
--cc=intel-gfx@lists.freedesktop.org \
--cc=umesh.nerlige.ramappa@intel.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox