Skip to content

Commit

Permalink
drm/i915/perf: Store a pointer to oa_format in oa_buffer
Browse files Browse the repository at this point in the history 
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.

v2: Drop format_size variable (Ashutosh)

Signed-off-by: Umesh Nerlige Ramappa <umesh.nerlige.ramappa@intel.com>
Reviewed-by: Lionel Landwerlin <lionel.g.landwerlin@intel.com>
Reviewed-by: Ashutosh Dixit <ashutosh.dixit@intel.com>
Signed-off-by: John Harrison <John.C.Harrison@Intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20221026222102.5526-11-umesh.nerlige.ramappa@intel.com
  • Loading branch information
Umesh Nerlige Ramappa authored and John Harrison committed Oct 27, 2022
1 parent cc85345 commit 90981da
Show file tree
Hide file tree
Showing 2 changed files with 13 additions and 20 deletions.
30 changes: 12 additions & 18 deletions drivers/gpu/drm/i915/i915_perf.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -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;
Expand Down Expand Up @@ -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);
Expand Down Expand Up @@ -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);
Expand Down Expand Up @@ -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[] = {
{
Expand Down Expand Up @@ -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.
Expand All @@ -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.
Expand All @@ -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
Expand Down Expand Up @@ -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) {
Expand Down Expand Up @@ -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;
Expand Down
3 changes: 1 addition & 2 deletions drivers/gpu/drm/i915/i915_perf_types.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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;

/**
Expand Down

0 comments on commit 90981da

Please sign in to comment.