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>

diff --git a/drivers/gpu/drm/i915/i915_gpu_error.c b/drivers/gpu/drm/i915/i915_gpu_error.c
index b58bdb4b962bc7f92ecd3d8dad19b70c9762f7da..cb11c10d922acb063a8eddee7f6dcf92b7db615a 100644 (file)
--- a/drivers/gpu/drm/i915/i915_gpu_error.c
+++ b/drivers/gpu/drm/i915/i915_gpu_error.c
@@ -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. */

diff --git a/drivers/gpu/drm/i915/i915_gpu_error.h b/drivers/gpu/drm/i915/i915_gpu_error.h
index 749e1c55613e839e73902640f88de2460184d501..ac55603a81d76e22597ae91600002c3124ad4c7b 100644 (file)
--- a/drivers/gpu/drm/i915/i915_gpu_error.h
+++ b/drivers/gpu/drm/i915/i915_gpu_error.h
@@ -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+ */