aboutsummaryrefslogtreecommitdiffstats
path: root/drivers
diff options
context:
space:
mode:
authorJesse Barnes <jbarnes@virtuousgeek.org>2010-09-27 10:35:44 -0700
committerChris Wilson <chris@chris-wilson.co.uk>2010-09-27 18:43:45 +0100
commitd270ae34eb77c58dea60e5b1e300a698d2ce39ac (patch)
tree85f6fefbb0cbb93187d668fe44655bef8e1c6ad9 /drivers
parentcf9a2f3afc75d41a61cbc91e725b9ce0746c400a (diff)
downloadmrst-s0i3-test-d270ae34eb77c58dea60e5b1e300a698d2ce39ac.tar.gz
mrst-s0i3-test-d270ae34eb77c58dea60e5b1e300a698d2ce39ac.tar.xz
mrst-s0i3-test-d270ae34eb77c58dea60e5b1e300a698d2ce39ac.zip
drm/i915: fix GMCH power reporting
The IPS driver needs to know the current power consumption of the GMCH in order to make decisions about when to increase or decrease the CPU and/or GPU power envelope. So fix up the divisions to save the results so the numbers are actually correct (contrary to some earlier comments and code, these functions do not modify the first argument and use it for the result). Signed-off-by: Jesse Barnes <jbarnes@virtuousgeek.org> Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk> Cc: stable@kernel.org
Diffstat (limited to 'drivers')
-rw-r--r--drivers/gpu/drm/i915/i915_dma.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/gpu/drm/i915/i915_dma.c b/drivers/gpu/drm/i915/i915_dma.c
index 9d67b485303..c74e4e8006d 100644
--- a/drivers/gpu/drm/i915/i915_dma.c
+++ b/drivers/gpu/drm/i915/i915_dma.c
@@ -1787,9 +1787,9 @@ unsigned long i915_chipset_val(struct drm_i915_private *dev_priv)
}
}
- div_u64(diff, diff1);
+ diff = div_u64(diff, diff1);
ret = ((m * diff) + c);
- div_u64(ret, 10);
+ ret = div_u64(ret, 10);
dev_priv->last_count1 = total_count;
dev_priv->last_time1 = now;
@@ -1858,7 +1858,7 @@ void i915_update_gfx_val(struct drm_i915_private *dev_priv)
/* More magic constants... */
diff = diff * 1181;
- div_u64(diff, diffms * 10);
+ diff = div_u64(diff, diffms * 10);
dev_priv->gfx_power = diff;
}