mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
synced 2026-05-09 00:43:08 -04:00
drm/i915/pmu: Use raw clock for rc6 estimation
RC6 is a hardware counter and as such estimating it using the raw clock
during runtime suspend is more appropriate.
Signed-off-by: Tvrtko Ursulin <tvrtko.ursulin@intel.com>
References: 34f439278c ("perf: Add per event clockid support")
Cc: Chris Wilson <chris@chris-wilson.co.uk>
Reviewed-by: Chris Wilson <chris@chris-wilson.co.uk>
Link: https://patchwork.freedesktop.org/patch/msgid/20201214094349.3563876-2-tvrtko.ursulin@linux.intel.com
This commit is contained in:
@@ -163,9 +163,9 @@ static u64 __get_rc6(struct intel_gt *gt)
|
||||
|
||||
#if IS_ENABLED(CONFIG_PM)
|
||||
|
||||
static inline s64 ktime_since(const ktime_t kt)
|
||||
static inline s64 ktime_since_raw(const ktime_t kt)
|
||||
{
|
||||
return ktime_to_ns(ktime_sub(ktime_get(), kt));
|
||||
return ktime_to_ns(ktime_sub(ktime_get_raw(), kt));
|
||||
}
|
||||
|
||||
static u64 get_rc6(struct intel_gt *gt)
|
||||
@@ -194,7 +194,7 @@ static u64 get_rc6(struct intel_gt *gt)
|
||||
* on top of the last known real value, as the approximated RC6
|
||||
* counter value.
|
||||
*/
|
||||
val = ktime_since(pmu->sleep_last);
|
||||
val = ktime_since_raw(pmu->sleep_last);
|
||||
val += pmu->sample[__I915_SAMPLE_RC6].cur;
|
||||
}
|
||||
|
||||
@@ -217,7 +217,7 @@ static void init_rc6(struct i915_pmu *pmu)
|
||||
pmu->sample[__I915_SAMPLE_RC6].cur = __get_rc6(&i915->gt);
|
||||
pmu->sample[__I915_SAMPLE_RC6_LAST_REPORTED].cur =
|
||||
pmu->sample[__I915_SAMPLE_RC6].cur;
|
||||
pmu->sleep_last = ktime_get();
|
||||
pmu->sleep_last = ktime_get_raw();
|
||||
}
|
||||
}
|
||||
|
||||
@@ -226,7 +226,7 @@ static void park_rc6(struct drm_i915_private *i915)
|
||||
struct i915_pmu *pmu = &i915->pmu;
|
||||
|
||||
pmu->sample[__I915_SAMPLE_RC6].cur = __get_rc6(&i915->gt);
|
||||
pmu->sleep_last = ktime_get();
|
||||
pmu->sleep_last = ktime_get_raw();
|
||||
}
|
||||
|
||||
#else
|
||||
|
||||
Reference in New Issue
Block a user