Commit 79cef515 authored by Jani Nikula's avatar Jani Nikula
Browse files

drm/i915: stop recording IER in error capture 



With pre-ilk GEN2_IER capture moved to gtier[0], the remaining IER
aren't all that relevant. Stop capturing them.

Suggested-by: default avatarVille Syrjälä <ville.syrjala@linux.intel.com>
Reviewed-by: default avatarVille Syrjälä <ville.syrjala@linux.intel.com>
Link: https://lore.kernel.org/r/6f1130a3d0d13e08a73ba381225ab978b22a9345.1744630147.git.jani.nikula@intel.com


Signed-off-by: default avatarJani Nikula <jani.nikula@intel.com>
parent ef321018

drivers/gpu/drm/i915/i915_gpu_error.c

+0 −8
Original line number Diff line number Diff line
@@ -729,7 +729,6 @@ static void err_print_gt_info(struct drm_i915_error_state_buf *m, 
static void err_print_gt_display(struct drm_i915_error_state_buf *m,

				 struct intel_gt_coredump *gt)

{

	err_printf(m, "IER: 0x%08x\n", gt->ier);

	err_printf(m, "DERRMR: 0x%08x\n", gt->derrmr);

}
@@ -1775,13 +1774,6 @@ static void gt_record_display_regs(struct intel_gt_coredump *gt) 


	if (DISPLAY_VER(i915) >= 6 && DISPLAY_VER(i915) < 20)

		gt->derrmr = intel_uncore_read(uncore, DERRMR);



	if (GRAPHICS_VER(i915) >= 8)

		gt->ier = intel_uncore_read(uncore, GEN8_DE_MISC_IER);

	else if (IS_VALLEYVIEW(i915))

		gt->ier = intel_uncore_read(uncore, VLV_IER);

	else if (HAS_PCH_SPLIT(i915))

		gt->ier = intel_uncore_read(uncore, DEIER);

}



/* Capture all other registers that GuC doesn't capture. */

drivers/gpu/drm/i915/i915_gpu_error.h

+0 −1
Original line number Diff line number Diff line
@@ -146,7 +146,6 @@ struct intel_gt_coredump { 
	/* Generic register state */

	u32 eir;

	u32 pgtbl_er;

	u32 ier;

	u32 gtier[6], ngtier;

	u32 forcewake;

	u32 error; /* gen6+ */