drm/i915: do not read swizzle info if unavailable (1fe541cc) · Commits · 戴 / test

drivers/gpu/drm/i915/i915_debugfs.c

+9 −5

Original line number	Diff line number	Diff line
		@@ -1138,13 +1138,20 @@ static int i915_swizzle_info(struct seq_file m, void data)
		struct intel_uncore *uncore = &dev_priv->uncore;
		intel_wakeref_t wakeref;

		wakeref = intel_runtime_pm_get(&dev_priv->runtime_pm);

		seq_printf(m, "bit6 swizzle for X-tiling = %s\n",
		swizzle_string(dev_priv->ggtt.bit_6_swizzle_x));
		seq_printf(m, "bit6 swizzle for Y-tiling = %s\n",
		swizzle_string(dev_priv->ggtt.bit_6_swizzle_y));

		if (dev_priv->quirks & QUIRK_PIN_SWIZZLED_PAGES)
		seq_puts(m, "L-shaped memory detected\n");

		/* On BDW+, swizzling is not used. See detect_bit_6_swizzle() */
		if (INTEL_GEN(dev_priv) >= 8 \|\| IS_VALLEYVIEW(dev_priv))
		return 0;

		wakeref = intel_runtime_pm_get(&dev_priv->runtime_pm);

		if (IS_GEN_RANGE(dev_priv, 3, 4)) {
		seq_printf(m, "DDC = 0x%08x\n",
		intel_uncore_read(uncore, DCC));
		@@ -1173,9 +1180,6 @@ static int i915_swizzle_info(struct seq_file m, void data)
		intel_uncore_read(uncore, DISP_ARB_CTL));
		}

		if (dev_priv->quirks & QUIRK_PIN_SWIZZLED_PAGES)
		seq_puts(m, "L-shaped memory detected\n");

		intel_runtime_pm_put(&dev_priv->runtime_pm, wakeref);

		return 0;