| Message ID | 1405587074-22887-1-git-send-email-deepak.s@linux.intel.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
On Thu, Jul 17, 2014 at 02:21:14PM +0530, deepak.s@linux.intel.com wrote: > From: Deepak S <deepak.s@linux.intel.com> > > This was fumbled while trying to use the cached min/min/rpe values in > the vlv debugfs code. > > This is a regression from > > commit 03af20458a57a50735b12c1e3c23abc7ff70c6fa > Author: Ville Syrjälä <ville.syrjala@linux.intel.com> > Date: Sat Jun 28 02:03:53 2014 +0300 > > drm/i915: Use the cached min/min/rpe values in the vlv debugfs code > > Signed-off-by: Deepak S <deepak.s@linux.intel.com> Queued for -next, thanks for the patch. -Daniel > --- > drivers/gpu/drm/i915/i915_debugfs.c | 6 +++--- > 1 file changed, 3 insertions(+), 3 deletions(-) > > diff --git a/drivers/gpu/drm/i915/i915_debugfs.c b/drivers/gpu/drm/i915/i915_debugfs.c > index fc39610..5bc65af 100644 > --- a/drivers/gpu/drm/i915/i915_debugfs.c > +++ b/drivers/gpu/drm/i915/i915_debugfs.c > @@ -1116,13 +1116,13 @@ static int i915_frequency_info(struct seq_file *m, void *unused) > seq_printf(m, "DDR freq: %d MHz\n", dev_priv->mem_freq); > > seq_printf(m, "max GPU freq: %d MHz\n", > - dev_priv->rps.max_freq); > + vlv_gpu_freq(dev_priv, dev_priv->rps.max_freq)); > > seq_printf(m, "min GPU freq: %d MHz\n", > - dev_priv->rps.min_freq); > + vlv_gpu_freq(dev_priv, dev_priv->rps.min_freq)); > > seq_printf(m, "efficient (RPe) frequency: %d MHz\n", > - dev_priv->rps.efficient_freq); > + vlv_gpu_freq(dev_priv, dev_priv->rps.efficient_freq)); > > seq_printf(m, "current GPU freq: %d MHz\n", > vlv_gpu_freq(dev_priv, (freq_sts >> 8) & 0xff)); > -- > 1.9.1 >
Oops, meant to reply-to-all On Thu, Jul 17, 2014 at 07:44:25PM -0700, Ben Widawsky wrote: > On Thu, Jul 17, 2014 at 10:42:20AM +0200, Daniel Vetter wrote: > > On Thu, Jul 17, 2014 at 02:21:14PM +0530, deepak.s@linux.intel.com wrote: > > > From: Deepak S <deepak.s@linux.intel.com> > > > > > > This was fumbled while trying to use the cached min/min/rpe values in > > > the vlv debugfs code. > > > > > > This is a regression from > > > > > > commit 03af20458a57a50735b12c1e3c23abc7ff70c6fa > > > Author: Ville Syrjälä <ville.syrjala@linux.intel.com> > > > Date: Sat Jun 28 02:03:53 2014 +0300 > > > > > > drm/i915: Use the cached min/min/rpe values in the vlv debugfs code > > > > > > Signed-off-by: Deepak S <deepak.s@linux.intel.com> > > > > Queued for -next, thanks for the patch. > > -Daniel > > Patch looks fine to me, and merge is fine, though I'd really prefer we > stop improving the debugfs interfaces when the sysfs interface now > exists for many releases, and are stable. > > If something here is not in sysfs, it should be. > </rant> > > > > > > --- > > > drivers/gpu/drm/i915/i915_debugfs.c | 6 +++--- > > > 1 file changed, 3 insertions(+), 3 deletions(-) > > > > > > diff --git a/drivers/gpu/drm/i915/i915_debugfs.c b/drivers/gpu/drm/i915/i915_debugfs.c > > > index fc39610..5bc65af 100644 > > > --- a/drivers/gpu/drm/i915/i915_debugfs.c > > > +++ b/drivers/gpu/drm/i915/i915_debugfs.c > > > @@ -1116,13 +1116,13 @@ static int i915_frequency_info(struct seq_file *m, void *unused) > > > seq_printf(m, "DDR freq: %d MHz\n", dev_priv->mem_freq); > > > > > > seq_printf(m, "max GPU freq: %d MHz\n", > > > - dev_priv->rps.max_freq); > > > + vlv_gpu_freq(dev_priv, dev_priv->rps.max_freq)); > > > > > > seq_printf(m, "min GPU freq: %d MHz\n", > > > - dev_priv->rps.min_freq); > > > + vlv_gpu_freq(dev_priv, dev_priv->rps.min_freq)); > > > > > > seq_printf(m, "efficient (RPe) frequency: %d MHz\n", > > > - dev_priv->rps.efficient_freq); > > > + vlv_gpu_freq(dev_priv, dev_priv->rps.efficient_freq)); > > > > > > seq_printf(m, "current GPU freq: %d MHz\n", > > > vlv_gpu_freq(dev_priv, (freq_sts >> 8) & 0xff)); > > > -- > > > 1.9.1 > > > > > > > -- > > Daniel Vetter > > Software Engineer, Intel Corporation > > +41 (0) 79 365 57 48 - http://blog.ffwll.ch > > _______________________________________________ > > Intel-gfx mailing list > > Intel-gfx@lists.freedesktop.org > > http://lists.freedesktop.org/mailman/listinfo/intel-gfx > > -- > Ben Widawsky, Intel Open Source Technology Center
diff --git a/drivers/gpu/drm/i915/i915_debugfs.c b/drivers/gpu/drm/i915/i915_debugfs.c index fc39610..5bc65af 100644 --- a/drivers/gpu/drm/i915/i915_debugfs.c +++ b/drivers/gpu/drm/i915/i915_debugfs.c @@ -1116,13 +1116,13 @@ static int i915_frequency_info(struct seq_file *m, void *unused) seq_printf(m, "DDR freq: %d MHz\n", dev_priv->mem_freq); seq_printf(m, "max GPU freq: %d MHz\n", - dev_priv->rps.max_freq); + vlv_gpu_freq(dev_priv, dev_priv->rps.max_freq)); seq_printf(m, "min GPU freq: %d MHz\n", - dev_priv->rps.min_freq); + vlv_gpu_freq(dev_priv, dev_priv->rps.min_freq)); seq_printf(m, "efficient (RPe) frequency: %d MHz\n", - dev_priv->rps.efficient_freq); + vlv_gpu_freq(dev_priv, dev_priv->rps.efficient_freq)); seq_printf(m, "current GPU freq: %d MHz\n", vlv_gpu_freq(dev_priv, (freq_sts >> 8) & 0xff));