From: Imre Deak <imre.deak@intel.com>
Date: Tue, 29 Sep 2015 13:28:46 +0000 (+0300)
Subject: drm/i915/bxt: fix RC6 residency time calculation
X-Git-Tag: MMI-PSA29.97-13-9~7427^2~45^2~1379
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=d8135109e45d4cf352387b7de66c216a176e37f0;p=GitHub%2FMotorolaMobilityLLC%2Fkernel-slsi.git

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>
---

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)
 
 		if (I915_READ(VLV_COUNTER_CONTROL) & VLV_COUNT_RANGE_HIGH)
 			units <<= 8;
+	} else if (IS_BROXTON(dev)) {
+		units = 1;
+		div = 1200;		/* 833.33ns */
 	}
 
 	raw_time = I915_READ(reg) * units;