From 4c57ff468fa48707777184b3da56432602f967af Mon Sep 17 00:00:00 2001 From: Tvrtko Ursulin Date: Fri, 24 Nov 2017 17:16:18 +0000 Subject: intel/pmu: Catch-up with i915 RC6 aggregation changes Since i915 PMU is removing separate RC6 counters and now aggregates all under a single one, catch up the test and intel-gpu-overlay with those changes. Signed-off-by: Tvrtko Ursulin Reviewed-by: Chris Wilson Signed-off-by: Chris Wilson --- lib/igt_perf.h | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) (limited to 'lib/igt_perf.h') diff --git a/lib/igt_perf.h b/lib/igt_perf.h index 5428feb0..7b66fc58 100644 --- a/lib/igt_perf.h +++ b/lib/igt_perf.h @@ -64,10 +64,8 @@ enum drm_i915_pmu_engine_sample { #define I915_PMU_REQUESTED_FREQUENCY __I915_PMU_OTHER(1) #define I915_PMU_INTERRUPTS __I915_PMU_OTHER(2) #define I915_PMU_RC6_RESIDENCY __I915_PMU_OTHER(3) -#define I915_PMU_RC6p_RESIDENCY __I915_PMU_OTHER(4) -#define I915_PMU_RC6pp_RESIDENCY __I915_PMU_OTHER(5) -#define I915_PMU_LAST I915_PMU_RC6pp_RESIDENCY +#define I915_PMU_LAST I915_PMU_RC6_RESIDENCY static inline int perf_event_open(struct perf_event_attr *attr, -- cgit v1.2.3