drm/i915/pmu: Fix enable count array size and bounds checking

Browse source

Enable count array is supposed to have one counter for each possible
engine sampler. As such, array sizing and bounds checking is not correct
and would blow up the asserts if more samplers were added.

No ill-effect in the current code base but lets fix it for correctness.

At the same time tidy the assert for readability and robustness.

v2:
 * One check per assert. (Chris Wilson)

Signed-off-by: Tvrtko Ursulin <tvrtko.ursulin@intel.com>
Fixes: b46a33e271 ("drm/i915/pmu: Expose a PMU interface for perf queries")
Reviewed-by: Chris Wilson <chris@chris-wilson.co.uk>
Link: https://patchwork.freedesktop.org/patch/msgid/20190205130353.21105-1-tvrtko.ursulin@linux.intel.com
(cherry picked from commit 26a11deea6)
Signed-off-by: Jani Nikula <jani.nikula@intel.com>

...

This commit is contained in:

Tvrtko Ursulin 2019-02-05 13:03:53 +00:00 • committed by Jani Nikula

parent 3b91a93597

commit d8b879bb2e

3 changed files with 22 additions and 11 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download patch file Download diff file Expand all files Collapse all files

22

drivers/gpu/drm/i915/i915_pmu.c

View file

2

drivers/gpu/drm/i915/i915_pmu.h

View file

9

drivers/gpu/drm/i915/intel_ringbuffer.h

View file