| Message ID | d91b9668369bec152cea2576c45acf15db809df5.1744208554.git.jani.nikula@intel.com (mailing list archive) |
|---|---|
| State | New |
| Headers | show |
| Series | drm/i915: error capture cleanups and refactor | expand |
On Wed, Apr 09, 2025 at 05:23:45PM +0300, Jani Nikula wrote: > 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> > Signed-off-by: Jani Nikula <jani.nikula@intel.com> > --- > drivers/gpu/drm/i915/i915_gpu_error.c | 8 -------- > drivers/gpu/drm/i915/i915_gpu_error.h | 1 - > 2 files changed, 9 deletions(-) > > diff --git a/drivers/gpu/drm/i915/i915_gpu_error.c b/drivers/gpu/drm/i915/i915_gpu_error.c > index 64c760e7b7ee..50cd0c433e6d 100644 > --- 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); I don't think the tools should care about this being there. Reviewed-by: Ville Syrjälä <ville.syrjala@linux.intel.com> > 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 749e1c55613e..ac55603a81d7 100644 > --- 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+ */ > -- > 2.39.5
diff --git a/drivers/gpu/drm/i915/i915_gpu_error.c b/drivers/gpu/drm/i915/i915_gpu_error.c index 64c760e7b7ee..50cd0c433e6d 100644 --- 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 749e1c55613e..ac55603a81d7 100644 --- 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+ */
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> Signed-off-by: Jani Nikula <jani.nikula@intel.com> --- drivers/gpu/drm/i915/i915_gpu_error.c | 8 -------- drivers/gpu/drm/i915/i915_gpu_error.h | 1 - 2 files changed, 9 deletions(-)