From 69ed4a2171fdc66a750e53f9d5d6c3d8a65f70b3 Mon Sep 17 00:00:00 2001 From: Ben Widawsky Date: Fri, 20 Apr 2012 11:50:01 -0700 Subject: [PATCH] --- yaml --- r: 307205 b: refs/heads/master c: a85d4bcb8a0cd5b3c754f98ff91ef2b9b3a73bc5 h: refs/heads/master i: 307203: 3cce8d5a975826a43cb3d33f016d43dc79bf3ade v: v3 --- [refs] | 2 +- trunk/drivers/gpu/drm/i915/i915_sysfs.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index d84481ff9dba..36bf27a36222 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 3801a7fd8615365a58960561d3bd3479b485ed3e +refs/heads/master: a85d4bcb8a0cd5b3c754f98ff91ef2b9b3a73bc5 diff --git a/trunk/drivers/gpu/drm/i915/i915_sysfs.c b/trunk/drivers/gpu/drm/i915/i915_sysfs.c index f1b5108931fe..79f83445afa0 100644 --- a/trunk/drivers/gpu/drm/i915/i915_sysfs.c +++ b/trunk/drivers/gpu/drm/i915/i915_sysfs.c @@ -39,8 +39,8 @@ static u32 calc_residency(struct drm_device *dev, const u32 reg) if (!intel_enable_rc6(dev)) return 0; - raw_time = I915_READ(reg) * 128ULL + 500; - return do_div(raw_time, 100000); + raw_time = I915_READ(reg) * 128ULL; + return DIV_ROUND_UP_ULL(raw_time, 100000); } static ssize_t