[Intel-gfx] [PATCH] drm/i915/gen9_lp: Fix DMC DC counter debugfs output

[Imre Deak]

On Wed, Oct 31, 2018 at 01:08:06PM -0700, Rodrigo Vivi wrote:
> On Wed, Oct 31, 2018 at 10:02:20PM +0200, Imre Deak wrote:
> > On GEN9 LP (BXT/GLK) DC6 is not supported, so don't print the counter
> > on those platforms. So far we did this on GLK too.
> > 
> > Testcase: igt/pm_dc/dc6-dpms
> > Cc: Jyoti Yadav <jyoti.r.yadav at intel.com>
> > Cc: Rodrigo Vivi <rodrigo.vivi at intel.com>
> > Signed-off-by: Imre Deak <imre.deak at intel.com>
> > ---
> >  drivers/gpu/drm/i915/i915_debugfs.c | 14 +++++++-------
> >  1 file changed, 7 insertions(+), 7 deletions(-)
> > 
> > diff --git a/drivers/gpu/drm/i915/i915_debugfs.c b/drivers/gpu/drm/i915/i915_debugfs.c
> > index 041319d48ca3..e11714aa1ca9 100644
> > --- a/drivers/gpu/drm/i915/i915_debugfs.c
> > +++ b/drivers/gpu/drm/i915/i915_debugfs.c
> > @@ -2916,15 +2916,15 @@ static int i915_dmc_info(struct seq_file *m, void *unused)
> >  	seq_printf(m, "version: %d.%d\n", CSR_VERSION_MAJOR(csr->version),
> >  		   CSR_VERSION_MINOR(csr->version));
> >  
> > -	if (IS_BROXTON(dev_priv)) {
> > -		seq_printf(m, "DC3 -> DC5 count: %d\n",
> > -			   I915_READ(BXT_CSR_DC3_DC5_COUNT));
> > -	} else if (IS_GEN(dev_priv, 9, 11)) {
> > -		seq_printf(m, "DC3 -> DC5 count: %d\n",
> > -			   I915_READ(SKL_CSR_DC3_DC5_COUNT));
> > +	if (INTEL_GEN(dev_priv) > 11)
> > +		goto out;
> > +
> > +	seq_printf(m, "DC3 -> DC5 count: %d\n",
> > +		   I915_READ(IS_BROXTON(dev_priv) ? BXT_CSR_DC3_DC5_COUNT :
> > +						    SKL_CSR_DC3_DC5_COUNT));
> > +	if (!IS_GEN9_LP(dev_priv))
> >  		seq_printf(m, "DC5 -> DC6 count: %d\n",
> >  			   I915_READ(SKL_CSR_DC5_DC6_COUNT));
> > -	}
> 
> What about a simple:
> 
> -	} else if (IS_GEN(dev_priv, 9, 11)) {
> -	} else if (IS_GEN(dev_priv, 9, 10) && !IS_GEMINILAKE(dev_priv)) {

You mean
-	} else if (IS_GEN(dev_priv, 9, 11)) {
+	} else if (IS_GEN(dev_priv, 9, 11) && !IS_GEMINILAKE(dev_priv)) {
?

That wouldn't print even the DC5 counter on GLK.

> 
> >  
> >  out:
> >  	seq_printf(m, "program base: 0x%08x\n", I915_READ(CSR_PROGRAM(0)));
> > -- 
> > 2.13.2
> >