diff options
| author | Dave Airlie <airlied@redhat.com> | 2023-06-02 10:33:29 +1000 |
|---|---|---|
| committer | Dave Airlie <airlied@redhat.com> | 2023-06-02 10:33:29 +1000 |
| commit | b6ccf213d95e9373ac1f7fbcb5de3b52eec0ddb3 (patch) | |
| tree | 96a3f865933fc89ff2677eedf166e9e7d34bdb0d | |
| parent | f9e94d6c85e9083466fef9a1ccd5b6b46f13af32 (diff) | |
| parent | 62fe398761cd06a428e6f367aba84732a2f1c268 (diff) | |
Merge tag 'drm-intel-fixes-2023-06-01' of git://anongit.freedesktop.org/drm/drm-intel into drm-fixesdrm-fixes-2023-06-02
- Fix for OA reporting to allow detecting non-power-of-two reports
Signed-off-by: Dave Airlie <airlied@redhat.com>
From: Joonas Lahtinen <joonas.lahtinen@linux.intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/ZHimf55x/DyXYar1@jlahtine-mobl.ger.corp.intel.com
| -rw-r--r-- | drivers/gpu/drm/i915/i915_perf.c | 17 |
1 files changed, 11 insertions, 6 deletions
diff --git a/drivers/gpu/drm/i915/i915_perf.c b/drivers/gpu/drm/i915/i915_perf.c index 050b8ae7b8e7..3035cba2c6a2 100644 --- a/drivers/gpu/drm/i915/i915_perf.c +++ b/drivers/gpu/drm/i915/i915_perf.c @@ -877,12 +877,17 @@ static int gen8_append_oa_reports(struct i915_perf_stream *stream, stream->oa_buffer.last_ctx_id = ctx_id; } - /* - * Clear out the report id and timestamp as a means to detect unlanded - * reports. - */ - oa_report_id_clear(stream, report32); - oa_timestamp_clear(stream, report32); + if (is_power_of_2(report_size)) { + /* + * Clear out the report id and timestamp as a means + * to detect unlanded reports. + */ + oa_report_id_clear(stream, report32); + oa_timestamp_clear(stream, report32); + } else { + /* Zero out the entire report */ + memset(report32, 0, report_size); + } } if (start_offset != *offset) { |