| From 7fca879e3e68b2240cee2a10a9bceaf455d0e7a3 Mon Sep 17 00:00:00 2001 |
| From: Jesse Barnes <jbarnes@virtuousgeek.org> |
| Date: Thu, 2 May 2013 10:48:08 -0700 |
| Subject: drm/i915: go back to switch for VLV mem freq detection v2 |
| |
| Both the docs and the existing code were wrong. So fix both and use a |
| switch statement like we do elsewhere to make things simple & clear. |
| |
| Signed-off-by: Jesse Barnes <jbarnes@virtuousgeek.org> |
| Reviewed-by: Ben Widawsky <ben@bwidawsk.net> |
| Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch> |
| (cherry picked from commit 2445966ee80837116498bd83084ad6d28272320c) |
| Signed-off-by: Darren Hart <dvhart@linux.intel.com> |
| --- |
| drivers/gpu/drm/i915/intel_pm.c | 13 ++++++++++++- |
| 1 file changed, 12 insertions(+), 1 deletion(-) |
| |
| diff --git a/drivers/gpu/drm/i915/intel_pm.c b/drivers/gpu/drm/i915/intel_pm.c |
| index 5977599bde42..c0a4f68f8a49 100644 |
| --- a/drivers/gpu/drm/i915/intel_pm.c |
| +++ b/drivers/gpu/drm/i915/intel_pm.c |
| @@ -2902,7 +2902,18 @@ static void valleyview_enable_rps(struct drm_device *dev) |
| GEN7_RC_CTL_TO_MODE); |
| |
| valleyview_punit_read(dev_priv, PUNIT_REG_GPU_FREQ_STS, &val); |
| - dev_priv->mem_freq = 800 + (266 * (val >> 6) & 3); |
| + switch ((val >> 6) & 3) { |
| + case 0: |
| + case 1: |
| + dev_priv->mem_freq = 800; |
| + break; |
| + case 2: |
| + dev_priv->mem_freq = 1066; |
| + break; |
| + case 3: |
| + dev_priv->mem_freq = 1333; |
| + break; |
| + } |
| DRM_DEBUG_DRIVER("DDR speed: %d MHz", dev_priv->mem_freq); |
| |
| DRM_DEBUG_DRIVER("GPLL enabled? %s\n", val & 0x10 ? "yes" : "no"); |
| -- |
| 1.8.5.rc3 |
| |