Commit 419491ea authored by Matt Atwood's avatar Matt Atwood Committed by Matt Roper

drm/i915: rename I915_PMU_MAX_GTS to I915_PMU_MAX_GT

_GTS as an abbreviation here leads to some confusion, match other
definitions and drop the s.

Cc: Matt Roper <matthew.d.roper@intel.com>
Cc: Ashutosh Dixit <ashutosh.dixit@linux.intel.com>
Cc: Andi Shyti <andy.shyti@linux.intel.com>
Cc: Tvrtko Ursulin <tvrtko.ursulin@intel.com>
Cc: Umesh Nerlige Ramappa <umesh.nerlige.ramappa@intel.com>
Signed-off-by: default avatarMatt Atwood <matthew.s.atwood@intel.com>
Reviewed-by: default avatarMatt Roper <matthew.d.roper@intel.com>
Signed-off-by: default avatarMatt Roper <matthew.d.roper@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20230602231754.1596433-3-matthew.s.atwood@intel.com
parent cd65de1a
...@@ -132,7 +132,7 @@ static u32 frequency_enabled_mask(void) ...@@ -132,7 +132,7 @@ static u32 frequency_enabled_mask(void)
unsigned int i; unsigned int i;
u32 mask = 0; u32 mask = 0;
for (i = 0; i < I915_PMU_MAX_GTS; i++) for (i = 0; i < I915_PMU_MAX_GT; i++)
mask |= config_mask(__I915_PMU_ACTUAL_FREQUENCY(i)) | mask |= config_mask(__I915_PMU_ACTUAL_FREQUENCY(i)) |
config_mask(__I915_PMU_REQUESTED_FREQUENCY(i)); config_mask(__I915_PMU_REQUESTED_FREQUENCY(i));
......
...@@ -38,7 +38,7 @@ enum { ...@@ -38,7 +38,7 @@ enum {
__I915_NUM_PMU_SAMPLERS __I915_NUM_PMU_SAMPLERS
}; };
#define I915_PMU_MAX_GTS 2 #define I915_PMU_MAX_GT 2
/* /*
* How many different events we track in the global PMU mask. * How many different events we track in the global PMU mask.
...@@ -47,7 +47,7 @@ enum { ...@@ -47,7 +47,7 @@ enum {
*/ */
#define I915_PMU_MASK_BITS \ #define I915_PMU_MASK_BITS \
(I915_ENGINE_SAMPLE_COUNT + \ (I915_ENGINE_SAMPLE_COUNT + \
I915_PMU_MAX_GTS * __I915_PMU_TRACKED_EVENT_COUNT) I915_PMU_MAX_GT * __I915_PMU_TRACKED_EVENT_COUNT)
#define I915_ENGINE_SAMPLE_COUNT (I915_SAMPLE_SEMA + 1) #define I915_ENGINE_SAMPLE_COUNT (I915_SAMPLE_SEMA + 1)
...@@ -127,11 +127,11 @@ struct i915_pmu { ...@@ -127,11 +127,11 @@ struct i915_pmu {
* Only global counters are held here, while the per-engine ones are in * Only global counters are held here, while the per-engine ones are in
* struct intel_engine_cs. * struct intel_engine_cs.
*/ */
struct i915_pmu_sample sample[I915_PMU_MAX_GTS][__I915_NUM_PMU_SAMPLERS]; struct i915_pmu_sample sample[I915_PMU_MAX_GT][__I915_NUM_PMU_SAMPLERS];
/** /**
* @sleep_last: Last time GT parked for RC6 estimation. * @sleep_last: Last time GT parked for RC6 estimation.
*/ */
ktime_t sleep_last[I915_PMU_MAX_GTS]; ktime_t sleep_last[I915_PMU_MAX_GT];
/** /**
* @irq_count: Number of interrupts * @irq_count: Number of interrupts
* *
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment