diff options
| author | Chris Wilson <chris@chris-wilson.co.uk> | 2010-09-28 15:48:38 +0100 |
|---|---|---|
| committer | Chris Wilson <chris@chris-wilson.co.uk> | 2010-09-28 15:48:38 +0100 |
| commit | e0e41598b433c0216814d54c62e7c1834f464d9b (patch) | |
| tree | a4069b104045797da2dc48c62e1acba0132ba98d /drivers/gpu/drm/i915/i915_dma.c | |
| parent | 8daf7473203cd9bd1b9b98200ee1c74dfe4826fe (diff) | |
| parent | d270ae34eb77c58dea60e5b1e300a698d2ce39ac (diff) | |
| download | kernel_samsung_crespo-e0e41598b433c0216814d54c62e7c1834f464d9b.zip kernel_samsung_crespo-e0e41598b433c0216814d54c62e7c1834f464d9b.tar.gz kernel_samsung_crespo-e0e41598b433c0216814d54c62e7c1834f464d9b.tar.bz2 | |
Merge branch 'drm-intel-fixes' into drm-intel-next
Diffstat (limited to 'drivers/gpu/drm/i915/i915_dma.c')
| -rw-r--r-- | drivers/gpu/drm/i915/i915_dma.c | 6 |
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 df1c353..df86d04 100644 --- a/drivers/gpu/drm/i915/i915_dma.c +++ b/drivers/gpu/drm/i915/i915_dma.c @@ -1602,9 +1602,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; @@ -1673,7 +1673,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; } |