Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

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: Ville Syrjälä <ville.syrjala@linux.intel.com>
Reviewed-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
Link: https://lore.kernel.org/r/6f1130a3d0d13e08a73ba381225ab978b22a9345.1744630147.git.jani.nikula@intel.com
Signed-off-by: Jani Nikula <jani.nikula@intel.com>

Jani Nikula 79cef515 ef321018

-9
-8
drivers/gpu/drm/i915/i915_gpu_error.c
··· 729 729 static void err_print_gt_display(struct drm_i915_error_state_buf *m, 730 730 struct intel_gt_coredump *gt) 731 731 { 732 - err_printf(m, "IER: 0x%08x\n", gt->ier); 733 732 err_printf(m, "DERRMR: 0x%08x\n", gt->derrmr); 734 733 } 735 734 ··· 1774 1775 1775 1776 if (DISPLAY_VER(i915) >= 6 && DISPLAY_VER(i915) < 20) 1776 1777 gt->derrmr = intel_uncore_read(uncore, DERRMR); 1777 - 1778 - if (GRAPHICS_VER(i915) >= 8) 1779 - gt->ier = intel_uncore_read(uncore, GEN8_DE_MISC_IER); 1780 - else if (IS_VALLEYVIEW(i915)) 1781 - gt->ier = intel_uncore_read(uncore, VLV_IER); 1782 - else if (HAS_PCH_SPLIT(i915)) 1783 - gt->ier = intel_uncore_read(uncore, DEIER); 1784 1778 } 1785 1779 1786 1780 /* Capture all other registers that GuC doesn't capture. */
-1
drivers/gpu/drm/i915/i915_gpu_error.h
··· 146 146 /* Generic register state */ 147 147 u32 eir; 148 148 u32 pgtbl_er; 149 - u32 ier; 150 149 u32 gtier[6], ngtier; 151 150 u32 forcewake; 152 151 u32 error; /* gen6+ */