drm/i915/pmu: Fix enable count array size and bounds checking
authorTvrtko Ursulin <tvrtko.ursulin@intel.com>
Tue, 5 Feb 2019 13:03:53 +0000 (13:03 +0000)
committerTvrtko Ursulin <tvrtko.ursulin@intel.com>
Wed, 6 Feb 2019 10:22:47 +0000 (10:22 +0000)
commit26a11deea685b41a43edb513194718aa1f461c9a
treea7751b9b2cd762a84b433bbcb964967e358c7031
parentbf002c100740f4ae01d0d86b44f65a712ee14031
drm/i915/pmu: Fix enable count array size and bounds checking

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: b46a33e271ed ("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
drivers/gpu/drm/i915/i915_pmu.c
drivers/gpu/drm/i915/i915_pmu.h
drivers/gpu/drm/i915/intel_ringbuffer.h