Chris has discovered that RC6, RC6p and RC6pp counters are mutually exclusive, and even that on some SNB SKUs you get RC6p increasing, and on the others RC6. Furthermore RC6p and RC6pp were only present starting from GEN6 until, GEN7, not including Haswell. All this combined makes it questionable whether we need to reserve new ABI for these counters. One idea was to just combine them all under the RC6 counter to simplify things for userspace. So that is what this patch does.
Showing the changes to include/uapi (1 of 2 files). Show all
Unified · Split
| @@ -137,14 +137,10 @@ enum drm_i915_pmu_engine_sample { · 136 unmodified lines | ||
| 137 | 137 | |
| 138 | 138 | #define I915_PMU_ACTUAL_FREQUENCY __I915_PMU_OTHER(0) |
| 139 | 139 | #define I915_PMU_REQUESTED_FREQUENCY __I915_PMU_OTHER(1) |
| 140 | − | |
| 141 | 140 | #define I915_PMU_INTERRUPTS __I915_PMU_OTHER(2) |
| 142 | − | |
| 143 | 141 | #define I915_PMU_RC6_RESIDENCY __I915_PMU_OTHER(3) |
| 144 | −#define I915_PMU_RC6p_RESIDENCY __I915_PMU_OTHER(4) | |
| 145 | −#define I915_PMU_RC6pp_RESIDENCY __I915_PMU_OTHER(5) | |
| 146 | 142 | |
| 147 | −#define I915_PMU_LAST I915_PMU_RC6pp_RESIDENCY | |
| 143 | +#define I915_PMU_LAST I915_PMU_RC6_RESIDENCY | |
| 148 | 144 | |
| 149 | 145 | /* Each region is a minimum of 16k, and there are at most 255 of them. |
| 150 | 146 | */ |