drm/i915/gen9_lp: Fix DMC DC counter debugfs output (34b2f8da) · Commits · 戴 / test

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. While at it warn if we forgot to adjust the printout properly for a new platform. (Rodrigo) Testcase: igt/pm_dc/dc6-dpms Cc: Jyoti Yadav <jyoti.r.yadav@intel.com> Cc: Rodrigo Vivi <rodrigo.vivi@intel.com> Signed-off-by:

Imre Deak <imre.deak@intel.com> Reviewed-by:

Rodrigo Vivi <rodrigo.vivi@intel.com> Link: https://patchwork.freedesktop.org/patch/msgid/20181031200220.11608-1-imre.deak@intel.com

drivers/gpu/drm/i915/i915_debugfs.c

+7 −7

Original line number	Original line	Diff line number	Diff line
	@@ -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),		seq_printf(m, "version: %d.%d\n", CSR_VERSION_MAJOR(csr->version),
	CSR_VERSION_MINOR(csr->version));		CSR_VERSION_MINOR(csr->version));

	if (IS_BROXTON(dev_priv)) {		if (WARN_ON(INTEL_GEN(dev_priv) > 11))
	seq_printf(m, "DC3 -> DC5 count: %d\n",		goto out;
	I915_READ(BXT_CSR_DC3_DC5_COUNT));
	} else if (IS_GEN(dev_priv, 9, 11)) {
	seq_printf(m, "DC3 -> DC5 count: %d\n",		seq_printf(m, "DC3 -> DC5 count: %d\n",
	I915_READ(SKL_CSR_DC3_DC5_COUNT));		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",		seq_printf(m, "DC5 -> DC6 count: %d\n",
	I915_READ(SKL_CSR_DC5_DC6_COUNT));		I915_READ(SKL_CSR_DC5_DC6_COUNT));
	}

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

Admin message