drm/i915: Check SFC fusing before recording/dumping SFC_DONE
authorMatt Roper <matthew.d.roper@intel.com>
Fri, 17 Sep 2021 16:12:03 +0000 (09:12 -0700)
committerMatt Roper <matthew.d.roper@intel.com>
Tue, 21 Sep 2021 04:42:10 +0000 (21:42 -0700)
On Xe_HP and beyond the SFC unit may be fused off, even if the
corresponding media engines are present.  Check the SFC-specific fusing
before trying to dump the SFC_DONE instances.

Cc: José Roberto de Souza <jose.souza@intel.com>
Signed-off-by: Matt Roper <matthew.d.roper@intel.com>
Reviewed-by: José Roberto de Souza <jose.souza@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20210917161203.812251-3-matthew.d.roper@intel.com
drivers/gpu/drm/i915/i915_gpu_error.c

index b9f66db..2a2d764 100644 (file)
@@ -753,7 +753,8 @@ static void err_print_gt(struct drm_i915_error_state_buf *m,
                         * only exists if the corresponding VCS engine is
                         * present.
                         */
-                       if (!HAS_ENGINE(gt->_gt, _VCS(i * 2)))
+                       if ((gt->_gt->info.sfc_mask & BIT(i)) == 0 ||
+                           !HAS_ENGINE(gt->_gt, _VCS(i * 2)))
                                continue;
 
                        err_printf(m, "  SFC_DONE[%d]: 0x%08x\n", i,
@@ -1632,7 +1633,8 @@ static void gt_record_regs(struct intel_gt_coredump *gt)
                         * only exists if the corresponding VCS engine is
                         * present.
                         */
-                       if (!HAS_ENGINE(gt->_gt, _VCS(i * 2)))
+                       if ((gt->_gt->info.sfc_mask & BIT(i)) == 0 ||
+                           !HAS_ENGINE(gt->_gt, _VCS(i * 2)))
                                continue;
 
                        gt->sfc_done[i] =