From mboxrd@z Thu Jan 1 00:00:00 1970 From: Chris Wilson Subject: Re: [PATCH v4] drm/i915: rc6 in sysfs Date: Wed, 11 Apr 2012 23:10:05 +0100 Message-ID: <1334182209_374087@CP5-2952> References: <1334117821-26481-1-git-send-email-ben@bwidawsk.net> <1334132085_361270@CP5-2952> Mime-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Return-path: Received: from fireflyinternet.com (smtp.fireflyinternet.com [109.228.6.236]) by gabe.freedesktop.org (Postfix) with ESMTP id CF2229EB44 for ; Wed, 11 Apr 2012 15:14:38 -0700 (PDT) In-Reply-To: <1334132085_361270@CP5-2952> List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: intel-gfx-bounces+gcfxdi-intel-gfx=m.gmane.org@lists.freedesktop.org Errors-To: intel-gfx-bounces+gcfxdi-intel-gfx=m.gmane.org@lists.freedesktop.org To: intel-gfx@lists.freedesktop.org Cc: Daniel Vetter , Ben Widawsky , f@chad-versace.us, Arjan van de Ven , Ben Widawsky List-Id: intel-gfx@lists.freedesktop.org On Wed, 11 Apr 2012 09:14:43 +0100, Chris Wilson wrote: > I'm down to just bikeshedding over useless lines of code which do not > even add visual clarity... > > Reviewed-by: Chris Wilson Oops, need to learn to spot 64-bit divides which become an issue on 32-bit builds. diff --git a/drivers/gpu/drm/i915/i915_sysfs.c b/drivers/gpu/drm/i915/i915_sysfs.c index 2319f06..f1b5108 100644 --- a/drivers/gpu/drm/i915/i915_sysfs.c +++ b/drivers/gpu/drm/i915/i915_sysfs.c @@ -35,14 +35,12 @@ static u32 calc_residency(struct drm_device *dev, const u32 reg) { struct drm_i915_private *dev_priv = dev->dev_private; u64 raw_time; /* 32b value may overflow during fixed point math */ - u32 residency; if (!intel_enable_rc6(dev)) return 0; - raw_time = I915_READ(reg) * 128ULL; - residency = DIV_ROUND_CLOSEST(raw_time, 1000) / 100; - return residency; + raw_time = I915_READ(reg) * 128ULL + 500; + return do_div(raw_time, 100000); } static ssize_t -- 1.7.9.5 -- Chris Wilson, Intel Open Source Technology Centre