Message ID | 20190801141732.31335-4-tvrtko.ursulin@linux.intel.com (mailing list archive) |
---|---|
State | New, archived |
Headers | show |
Series | [1/5] drm/i915/pmu: Make more struct i915_pmu centric | expand |
Quoting Tvrtko Ursulin (2019-08-01 15:17:31) > From: Tvrtko Ursulin <tvrtko.ursulin@intel.com> > > RC6 is a GT state so make the function parameter reflect that. > > Signed-off-by: Tvrtko Ursulin <tvrtko.ursulin@intel.com> > --- > drivers/gpu/drm/i915/i915_pmu.c | 12 +++++++----- > 1 file changed, 7 insertions(+), 5 deletions(-) > > diff --git a/drivers/gpu/drm/i915/i915_pmu.c b/drivers/gpu/drm/i915/i915_pmu.c > index 5cf9a47a0c43..e0e0180bca7c 100644 > --- a/drivers/gpu/drm/i915/i915_pmu.c > +++ b/drivers/gpu/drm/i915/i915_pmu.c > @@ -431,8 +431,9 @@ static int i915_pmu_event_init(struct perf_event *event) > return 0; > } > > -static u64 __get_rc6(struct drm_i915_private *i915) > +static u64 __get_rc6(struct intel_gt *gt) > { > + struct drm_i915_private *i915 = gt->i915; This ties nicely into a patch that moved the rc6 state beneath intel_gt... Reviewed-by: Chris Wilson <chris@chris-wilson.co.uk> -Chris
diff --git a/drivers/gpu/drm/i915/i915_pmu.c b/drivers/gpu/drm/i915/i915_pmu.c index 5cf9a47a0c43..e0e0180bca7c 100644 --- a/drivers/gpu/drm/i915/i915_pmu.c +++ b/drivers/gpu/drm/i915/i915_pmu.c @@ -431,8 +431,9 @@ static int i915_pmu_event_init(struct perf_event *event) return 0; } -static u64 __get_rc6(struct drm_i915_private *i915) +static u64 __get_rc6(struct intel_gt *gt) { + struct drm_i915_private *i915 = gt->i915; u64 val; val = intel_rc6_residency_ns(i915, @@ -449,9 +450,10 @@ static u64 __get_rc6(struct drm_i915_private *i915) return val; } -static u64 get_rc6(struct drm_i915_private *i915) +static u64 get_rc6(struct intel_gt *gt) { #if IS_ENABLED(CONFIG_PM) + struct drm_i915_private *i915 = gt->i915; struct intel_runtime_pm *rpm = &i915->runtime_pm; struct i915_pmu *pmu = &i915->pmu; intel_wakeref_t wakeref; @@ -460,7 +462,7 @@ static u64 get_rc6(struct drm_i915_private *i915) wakeref = intel_runtime_pm_get_if_in_use(rpm); if (wakeref) { - val = __get_rc6(i915); + val = __get_rc6(gt); intel_runtime_pm_put(rpm, wakeref); /* @@ -523,7 +525,7 @@ static u64 get_rc6(struct drm_i915_private *i915) return val; #else - return __get_rc6(i915); + return __get_rc6(gt); #endif } @@ -566,7 +568,7 @@ static u64 __i915_pmu_event_read(struct perf_event *event) val = count_interrupts(i915); break; case I915_PMU_RC6_RESIDENCY: - val = get_rc6(i915); + val = get_rc6(&i915->gt); break; } }