[PATCH] drm/i915: Don't spam dmesg with rps messages on vlv/chv

[PATCH] drm/i915: Don't spam dmesg with rps messages on vlv/chv

[ville.syrjala]

From: Ville Syrjälä <ville.syrjala@linux.intel.com>

If the GPU frequency isn't going to change don't spam dmesg with
debug messages about it.

Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
---
 drivers/gpu/drm/i915/intel_pm.c | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

diff --git a/drivers/gpu/drm/i915/intel_pm.c b/drivers/gpu/drm/i915/intel_pm.c
index 78e39f8..9bc44f0 100644
--- a/drivers/gpu/drm/i915/intel_pm.c
+++ b/drivers/gpu/drm/i915/intel_pm.c
@@ -3488,17 +3488,18 @@ void valleyview_set_rps(struct drm_device *dev, u8 val)
 	WARN_ON(val > dev_priv->rps.max_freq_softlimit);
 	WARN_ON(val < dev_priv->rps.min_freq_softlimit);
 
-	DRM_DEBUG_DRIVER("GPU freq request from %d MHz (%u) to %d MHz (%u)\n",
-			 vlv_gpu_freq(dev_priv, dev_priv->rps.cur_freq),
-			 dev_priv->rps.cur_freq,
-			 vlv_gpu_freq(dev_priv, val), val);
-
 	if (WARN_ONCE(IS_CHERRYVIEW(dev) && (val & 1),
 		      "Odd GPU freq value\n"))
 		val &= ~1;
 
-	if (val != dev_priv->rps.cur_freq)
+	if (val != dev_priv->rps.cur_freq) {
+		DRM_DEBUG_DRIVER("GPU freq request from %d MHz (%u) to %d MHz (%u)\n",
+				 vlv_gpu_freq(dev_priv, dev_priv->rps.cur_freq),
+				 dev_priv->rps.cur_freq,
+				 vlv_gpu_freq(dev_priv, val), val);
+
 		vlv_punit_write(dev_priv, PUNIT_REG_GPU_FREQ_REQ, val);
+	}
 
 	I915_WRITE(GEN6_PMINTRMSK, gen6_rps_pm_mask(dev_priv, val));
 
-- 
1.8.5.5

_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/intel-gfx

Re: [PATCH] drm/i915: Don't spam dmesg with rps messages on vlv/chv

[Jani Nikula]

On Tue, 02 Sep 2014, ville.syrjala@linux.intel.com wrote:
> From: Ville Syrjälä <ville.syrjala@linux.intel.com>
>
> If the GPU frequency isn't going to change don't spam dmesg with
> debug messages about it.
>
> Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com>

Oh yes please!

Reviewed-by: Jani Nikula <jani.nikula@intel.com>


> ---
>  drivers/gpu/drm/i915/intel_pm.c | 13 +++++++------
>  1 file changed, 7 insertions(+), 6 deletions(-)
>
> diff --git a/drivers/gpu/drm/i915/intel_pm.c b/drivers/gpu/drm/i915/intel_pm.c
> index 78e39f8..9bc44f0 100644
> --- a/drivers/gpu/drm/i915/intel_pm.c
> +++ b/drivers/gpu/drm/i915/intel_pm.c
> @@ -3488,17 +3488,18 @@ void valleyview_set_rps(struct drm_device *dev, u8 val)
>  	WARN_ON(val > dev_priv->rps.max_freq_softlimit);
>  	WARN_ON(val < dev_priv->rps.min_freq_softlimit);
>  
> -	DRM_DEBUG_DRIVER("GPU freq request from %d MHz (%u) to %d MHz (%u)\n",
> -			 vlv_gpu_freq(dev_priv, dev_priv->rps.cur_freq),
> -			 dev_priv->rps.cur_freq,
> -			 vlv_gpu_freq(dev_priv, val), val);
> -
>  	if (WARN_ONCE(IS_CHERRYVIEW(dev) && (val & 1),
>  		      "Odd GPU freq value\n"))
>  		val &= ~1;
>  
> -	if (val != dev_priv->rps.cur_freq)
> +	if (val != dev_priv->rps.cur_freq) {
> +		DRM_DEBUG_DRIVER("GPU freq request from %d MHz (%u) to %d MHz (%u)\n",
> +				 vlv_gpu_freq(dev_priv, dev_priv->rps.cur_freq),
> +				 dev_priv->rps.cur_freq,
> +				 vlv_gpu_freq(dev_priv, val), val);
> +
>  		vlv_punit_write(dev_priv, PUNIT_REG_GPU_FREQ_REQ, val);
> +	}
>  
>  	I915_WRITE(GEN6_PMINTRMSK, gen6_rps_pm_mask(dev_priv, val));
>  
> -- 
> 1.8.5.5
>
> _______________________________________________
> Intel-gfx mailing list
> Intel-gfx@lists.freedesktop.org
> http://lists.freedesktop.org/mailman/listinfo/intel-gfx

-- 
Jani Nikula, Intel Open Source Technology Center
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/intel-gfx

Re: [PATCH] drm/i915: Don't spam dmesg with rps messages on vlv/chv

[Chris Wilson]

On Tue, Sep 02, 2014 at 03:12:17PM +0300, ville.syrjala@linux.intel.com wrote:
> From: Ville Syrjälä <ville.syrjala@linux.intel.com>
> 
> If the GPU frequency isn't going to change don't spam dmesg with
> debug messages about it.

I'd be more worried about why. gen6_rps_idle()?
-Chris

-- 
Chris Wilson, Intel Open Source Technology Centre

Re: [PATCH] drm/i915: Don't spam dmesg with rps messages on vlv/chv

[Ville Syrjälä]

On Tue, Sep 02, 2014 at 01:45:29PM +0100, Chris Wilson wrote:
> On Tue, Sep 02, 2014 at 03:12:17PM +0300, ville.syrjala@linux.intel.com wrote:
> > From: Ville Syrjälä <ville.syrjala@linux.intel.com>
> > 
> > If the GPU frequency isn't going to change don't spam dmesg with
> > debug messages about it.
> 
> I'd be more worried about why. gen6_rps_idle()?

Hmm. Good question. I suppose the PMINTRMSK frobbing should prevent
it from doing that. rps_idle should not be involved since it tries to
set the max freq all the time when running some benchmark. I'll try
to investigate a bit more...

-- 
Ville Syrjälä
Intel OTC

Re: [PATCH] drm/i915: Don't spam dmesg with rps messages on vlv/chv

[Ville Syrjälä]

On Tue, Sep 02, 2014 at 04:17:34PM +0300, Ville Syrjälä wrote:
> On Tue, Sep 02, 2014 at 01:45:29PM +0100, Chris Wilson wrote:
> > On Tue, Sep 02, 2014 at 03:12:17PM +0300, ville.syrjala@linux.intel.com wrote:
> > > From: Ville Syrjälä <ville.syrjala@linux.intel.com>
> > > 
> > > If the GPU frequency isn't going to change don't spam dmesg with
> > > debug messages about it.
> > 
> > I'd be more worried about why. gen6_rps_idle()?
> 
> Hmm. Good question. I suppose the PMINTRMSK frobbing should prevent
> it from doing that. rps_idle should not be involved since it tries to
> set the max freq all the time when running some benchmark. I'll try
> to investigate a bit more...

gen6_rps_boost() is one culprit at least. So yeah I think we want this
patch, or maybe even make it DRM_DEBUG() to shut it up more? Or maybe
just kill it since we don't print this stuff for other platforms either?

-- 
Ville Syrjälä
Intel OTC

Re: [PATCH] drm/i915: Don't spam dmesg with rps messages on vlv/chv

[Chris Wilson]

On Tue, Sep 02, 2014 at 04:46:55PM +0300, Ville Syrjälä wrote:
> On Tue, Sep 02, 2014 at 04:17:34PM +0300, Ville Syrjälä wrote:
> > On Tue, Sep 02, 2014 at 01:45:29PM +0100, Chris Wilson wrote:
> > > On Tue, Sep 02, 2014 at 03:12:17PM +0300, ville.syrjala@linux.intel.com wrote:
> > > > From: Ville Syrjälä <ville.syrjala@linux.intel.com>
> > > > 
> > > > If the GPU frequency isn't going to change don't spam dmesg with
> > > > debug messages about it.
> > > 
> > > I'd be more worried about why. gen6_rps_idle()?
> > 
> > Hmm. Good question. I suppose the PMINTRMSK frobbing should prevent
> > it from doing that. rps_idle should not be involved since it tries to
> > set the max freq all the time when running some benchmark. I'll try
> > to investigate a bit more...
> 
> gen6_rps_boost() is one culprit at least. So yeah I think we want this
> patch, or maybe even make it DRM_DEBUG() to shut it up more? Or maybe
> just kill it since we don't print this stuff for other platforms either?

You were reviewing patches which included a suppression for that, or so
I thought this morning.... Or maybe those patches are only my machines
here. Hmm.
-Chris

-- 
Chris Wilson, Intel Open Source Technology Centre

Re: [PATCH] drm/i915: Don't spam dmesg with rps messages on vlv/chv

[Daniel Vetter]

On Tue, Sep 02, 2014 at 03:38:44PM +0300, Jani Nikula wrote:
> On Tue, 02 Sep 2014, ville.syrjala@linux.intel.com wrote:
> > From: Ville Syrjälä <ville.syrjala@linux.intel.com>
> >
> > If the GPU frequency isn't going to change don't spam dmesg with
> > debug messages about it.
> >
> > Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
> 
> Oh yes please!
> 
> Reviewed-by: Jani Nikula <jani.nikula@intel.com>

Queued for -next-fixes, thanks for the patch.
-Daniel

> 
> 
> > ---
> >  drivers/gpu/drm/i915/intel_pm.c | 13 +++++++------
> >  1 file changed, 7 insertions(+), 6 deletions(-)
> >
> > diff --git a/drivers/gpu/drm/i915/intel_pm.c b/drivers/gpu/drm/i915/intel_pm.c
> > index 78e39f8..9bc44f0 100644
> > --- a/drivers/gpu/drm/i915/intel_pm.c
> > +++ b/drivers/gpu/drm/i915/intel_pm.c
> > @@ -3488,17 +3488,18 @@ void valleyview_set_rps(struct drm_device *dev, u8 val)
> >  	WARN_ON(val > dev_priv->rps.max_freq_softlimit);
> >  	WARN_ON(val < dev_priv->rps.min_freq_softlimit);
> >  
> > -	DRM_DEBUG_DRIVER("GPU freq request from %d MHz (%u) to %d MHz (%u)\n",
> > -			 vlv_gpu_freq(dev_priv, dev_priv->rps.cur_freq),
> > -			 dev_priv->rps.cur_freq,
> > -			 vlv_gpu_freq(dev_priv, val), val);
> > -
> >  	if (WARN_ONCE(IS_CHERRYVIEW(dev) && (val & 1),
> >  		      "Odd GPU freq value\n"))
> >  		val &= ~1;
> >  
> > -	if (val != dev_priv->rps.cur_freq)
> > +	if (val != dev_priv->rps.cur_freq) {
> > +		DRM_DEBUG_DRIVER("GPU freq request from %d MHz (%u) to %d MHz (%u)\n",
> > +				 vlv_gpu_freq(dev_priv, dev_priv->rps.cur_freq),
> > +				 dev_priv->rps.cur_freq,
> > +				 vlv_gpu_freq(dev_priv, val), val);
> > +
> >  		vlv_punit_write(dev_priv, PUNIT_REG_GPU_FREQ_REQ, val);
> > +	}
> >  
> >  	I915_WRITE(GEN6_PMINTRMSK, gen6_rps_pm_mask(dev_priv, val));
> >  
> > -- 
> > 1.8.5.5
> >
> > _______________________________________________
> > Intel-gfx mailing list
> > Intel-gfx@lists.freedesktop.org
> > http://lists.freedesktop.org/mailman/listinfo/intel-gfx
> 
> -- 
> Jani Nikula, Intel Open Source Technology Center
> _______________________________________________
> Intel-gfx mailing list
> Intel-gfx@lists.freedesktop.org
> http://lists.freedesktop.org/mailman/listinfo/intel-gfx

-- 
Daniel Vetter
Software Engineer, Intel Corporation
+41 (0) 79 365 57 48 - http://blog.ffwll.ch