aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/gpu/drm/i915/i915_sysfs.c
diff options
context:
space:
mode:
authorImre Deak <imre.deak@intel.com>2015-09-29 09:28:46 -0400
committerDaniel Vetter <daniel.vetter@ffwll.ch>2015-09-30 11:15:13 -0400
commitd8135109e45d4cf352387b7de66c216a176e37f0 (patch)
treea4b03312749b5e8dd1c28a58f3a1c8640c0698f0 /drivers/gpu/drm/i915/i915_sysfs.c
parent93f253187c2f565678bd7e5ca5f64c1043774f1b (diff)
drm/i915/bxt: fix RC6 residency time calculation
The RC6 residency time unit is 833.33ns on BXT according to the specification, so update the calculation accordingly. Use the same way as CHV/VLV to divide by the corresponding frequency, as I think this is the more natural unit for what the HW does internally. v2: - add missing IS_BROXTON check (Ville) Testcase: igt/pm_rc6_residency Signed-off-by: Imre Deak <imre.deak@intel.com> Reviewed-by: Ville Syrjälä <ville.syrjala@linux.intel.com> Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
Diffstat (limited to 'drivers/gpu/drm/i915/i915_sysfs.c')
-rw-r--r--drivers/gpu/drm/i915/i915_sysfs.c3
1 files changed, 3 insertions, 0 deletions
diff --git a/drivers/gpu/drm/i915/i915_sysfs.c b/drivers/gpu/drm/i915/i915_sysfs.c
index 74086eb5bf83..50ce9ce2b269 100644
--- a/drivers/gpu/drm/i915/i915_sysfs.c
+++ b/drivers/gpu/drm/i915/i915_sysfs.c
@@ -54,6 +54,9 @@ static u32 calc_residency(struct drm_device *dev, const u32 reg)
54 54
55 if (I915_READ(VLV_COUNTER_CONTROL) & VLV_COUNT_RANGE_HIGH) 55 if (I915_READ(VLV_COUNTER_CONTROL) & VLV_COUNT_RANGE_HIGH)
56 units <<= 8; 56 units <<= 8;
57 } else if (IS_BROXTON(dev)) {
58 units = 1;
59 div = 1200; /* 833.33ns */
57 } 60 }
58 61
59 raw_time = I915_READ(reg) * units; 62 raw_time = I915_READ(reg) * units;