Skip to content

Commit 419491e

Browse files
msatwoodmattrope
authored andcommitted
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 <[email protected]> Cc: Ashutosh Dixit <[email protected]> Cc: Andi Shyti <[email protected]> Cc: Tvrtko Ursulin <[email protected]> Cc: Umesh Nerlige Ramappa <[email protected]> Signed-off-by: Matt Atwood <[email protected]> Reviewed-by: Matt Roper <[email protected]> Signed-off-by: Matt Roper <[email protected]> Link: https://patchwork.freedesktop.org/patch/msgid/[email protected]
1 parent cd65de1 commit 419491e

File tree

2 files changed

+5
-5
lines changed

2 files changed

+5
-5
lines changed

drivers/gpu/drm/i915/i915_pmu.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -132,7 +132,7 @@ static u32 frequency_enabled_mask(void)
132132
unsigned int i;
133133
u32 mask = 0;
134134

135-
for (i = 0; i < I915_PMU_MAX_GTS; i++)
135+
for (i = 0; i < I915_PMU_MAX_GT; i++)
136136
mask |= config_mask(__I915_PMU_ACTUAL_FREQUENCY(i)) |
137137
config_mask(__I915_PMU_REQUESTED_FREQUENCY(i));
138138

drivers/gpu/drm/i915/i915_pmu.h

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ enum {
3838
__I915_NUM_PMU_SAMPLERS
3939
};
4040

41-
#define I915_PMU_MAX_GTS 2
41+
#define I915_PMU_MAX_GT 2
4242

4343
/*
4444
* How many different events we track in the global PMU mask.
@@ -47,7 +47,7 @@ enum {
4747
*/
4848
#define I915_PMU_MASK_BITS \
4949
(I915_ENGINE_SAMPLE_COUNT + \
50-
I915_PMU_MAX_GTS * __I915_PMU_TRACKED_EVENT_COUNT)
50+
I915_PMU_MAX_GT * __I915_PMU_TRACKED_EVENT_COUNT)
5151

5252
#define I915_ENGINE_SAMPLE_COUNT (I915_SAMPLE_SEMA + 1)
5353

@@ -127,11 +127,11 @@ struct i915_pmu {
127127
* Only global counters are held here, while the per-engine ones are in
128128
* struct intel_engine_cs.
129129
*/
130-
struct i915_pmu_sample sample[I915_PMU_MAX_GTS][__I915_NUM_PMU_SAMPLERS];
130+
struct i915_pmu_sample sample[I915_PMU_MAX_GT][__I915_NUM_PMU_SAMPLERS];
131131
/**
132132
* @sleep_last: Last time GT parked for RC6 estimation.
133133
*/
134-
ktime_t sleep_last[I915_PMU_MAX_GTS];
134+
ktime_t sleep_last[I915_PMU_MAX_GT];
135135
/**
136136
* @irq_count: Number of interrupts
137137
*

0 commit comments

Comments
 (0)