| Message ID | 20130312054631.GA21167@www.outflux.net (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
On Mon, Mar 11, 2013 at 10:46:31PM -0700, Kees Cook wrote: > This replaces the open-coded divisions in the debugfs code by calls > to do_div(). > > Signed-off-by: Kees Cook <keescook@chromium.org> > Cc: Daniel Vetter <daniel.vetter@ffwll.ch> Squashed into the debugfs patch which introduced this regression, thanks for the quick fixup. -Daniel > --- > drivers/gpu/drm/i915/i915_debugfs.c | 12 ++++++------ > 1 file changed, 6 insertions(+), 6 deletions(-) > > diff --git a/drivers/gpu/drm/i915/i915_debugfs.c b/drivers/gpu/drm/i915/i915_debugfs.c > index d86c304..6f3cbf8 100644 > --- a/drivers/gpu/drm/i915/i915_debugfs.c > +++ b/drivers/gpu/drm/i915/i915_debugfs.c > @@ -1814,9 +1814,9 @@ i915_max_freq_set(void *data, u64 val) > /* > * Turbo will still be enabled, but won't go above the set value. > */ > - dev_priv->rps.max_delay = val / GT_FREQUENCY_MULTIPLIER; > - > - gen6_set_rps(dev, val / GT_FREQUENCY_MULTIPLIER); > + do_div(val, GT_FREQUENCY_MULTIPLIER); > + dev_priv->rps.max_delay = val; > + gen6_set_rps(dev, val); > mutex_unlock(&dev_priv->rps.hw_lock); > > return 0; > @@ -1865,9 +1865,9 @@ i915_min_freq_set(void *data, u64 val) > /* > * Turbo will still be enabled, but won't go below the set value. > */ > - dev_priv->rps.min_delay = val / GT_FREQUENCY_MULTIPLIER; > - > - gen6_set_rps(dev, val / GT_FREQUENCY_MULTIPLIER); > + do_div(val, GT_FREQUENCY_MULTIPLIER); > + dev_priv->rps.min_delay = val; > + gen6_set_rps(dev, val); > mutex_unlock(&dev_priv->rps.hw_lock); > > return 0; > -- > 1.7.9.5 > > > -- > Kees Cook > Chrome OS Security
diff --git a/drivers/gpu/drm/i915/i915_debugfs.c b/drivers/gpu/drm/i915/i915_debugfs.c index d86c304..6f3cbf8 100644 --- a/drivers/gpu/drm/i915/i915_debugfs.c +++ b/drivers/gpu/drm/i915/i915_debugfs.c @@ -1814,9 +1814,9 @@ i915_max_freq_set(void *data, u64 val) /* * Turbo will still be enabled, but won't go above the set value. */ - dev_priv->rps.max_delay = val / GT_FREQUENCY_MULTIPLIER; - - gen6_set_rps(dev, val / GT_FREQUENCY_MULTIPLIER); + do_div(val, GT_FREQUENCY_MULTIPLIER); + dev_priv->rps.max_delay = val; + gen6_set_rps(dev, val); mutex_unlock(&dev_priv->rps.hw_lock); return 0; @@ -1865,9 +1865,9 @@ i915_min_freq_set(void *data, u64 val) /* * Turbo will still be enabled, but won't go below the set value. */ - dev_priv->rps.min_delay = val / GT_FREQUENCY_MULTIPLIER; - - gen6_set_rps(dev, val / GT_FREQUENCY_MULTIPLIER); + do_div(val, GT_FREQUENCY_MULTIPLIER); + dev_priv->rps.min_delay = val; + gen6_set_rps(dev, val); mutex_unlock(&dev_priv->rps.hw_lock); return 0;
This replaces the open-coded divisions in the debugfs code by calls to do_div(). Signed-off-by: Kees Cook <keescook@chromium.org> Cc: Daniel Vetter <daniel.vetter@ffwll.ch> --- drivers/gpu/drm/i915/i915_debugfs.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-)