Commit 518ea582 authored by Tvrtko Ursulin's avatar Tvrtko Ursulin Committed by Chris Wilson

drm/i915/pmu: Make get_rc6 take intel_gt

RC6 is a GT state so make the function parameter reflect that.
Signed-off-by: default avatarTvrtko Ursulin <tvrtko.ursulin@intel.com>
Reviewed-by: default avatarChris Wilson <chris@chris-wilson.co.uk>
Signed-off-by: default avatarChris Wilson <chris@chris-wilson.co.uk>
Link: https://patchwork.freedesktop.org/patch/msgid/20190801162330.2729-4-tvrtko.ursulin@linux.intel.com
parent 08ce5c64
...@@ -431,8 +431,9 @@ static int i915_pmu_event_init(struct perf_event *event) ...@@ -431,8 +431,9 @@ static int i915_pmu_event_init(struct perf_event *event)
return 0; 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; u64 val;
val = intel_rc6_residency_ns(i915, val = intel_rc6_residency_ns(i915,
...@@ -449,9 +450,10 @@ static u64 __get_rc6(struct drm_i915_private *i915) ...@@ -449,9 +450,10 @@ static u64 __get_rc6(struct drm_i915_private *i915)
return val; return val;
} }
static u64 get_rc6(struct drm_i915_private *i915) static u64 get_rc6(struct intel_gt *gt)
{ {
#if IS_ENABLED(CONFIG_PM) #if IS_ENABLED(CONFIG_PM)
struct drm_i915_private *i915 = gt->i915;
struct intel_runtime_pm *rpm = &i915->runtime_pm; struct intel_runtime_pm *rpm = &i915->runtime_pm;
struct i915_pmu *pmu = &i915->pmu; struct i915_pmu *pmu = &i915->pmu;
intel_wakeref_t wakeref; intel_wakeref_t wakeref;
...@@ -460,7 +462,7 @@ static u64 get_rc6(struct drm_i915_private *i915) ...@@ -460,7 +462,7 @@ static u64 get_rc6(struct drm_i915_private *i915)
wakeref = intel_runtime_pm_get_if_in_use(rpm); wakeref = intel_runtime_pm_get_if_in_use(rpm);
if (wakeref) { if (wakeref) {
val = __get_rc6(i915); val = __get_rc6(gt);
intel_runtime_pm_put(rpm, wakeref); intel_runtime_pm_put(rpm, wakeref);
/* /*
...@@ -523,7 +525,7 @@ static u64 get_rc6(struct drm_i915_private *i915) ...@@ -523,7 +525,7 @@ static u64 get_rc6(struct drm_i915_private *i915)
return val; return val;
#else #else
return __get_rc6(i915); return __get_rc6(gt);
#endif #endif
} }
...@@ -566,7 +568,7 @@ static u64 __i915_pmu_event_read(struct perf_event *event) ...@@ -566,7 +568,7 @@ static u64 __i915_pmu_event_read(struct perf_event *event)
val = count_interrupts(i915); val = count_interrupts(i915);
break; break;
case I915_PMU_RC6_RESIDENCY: case I915_PMU_RC6_RESIDENCY:
val = get_rc6(i915); val = get_rc6(&i915->gt);
break; break;
} }
} }
......
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