[Intel-gfx] [PATCH 2/2] drm/i915: Check SFC fusing before recording/dumping SFC_DONE

[Souza, Jose]

On Fri, 2021-09-17 at 09:12 -0700, Matt Roper wrote:
> 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.

Reviewed-by: José Roberto de Souza <jose.souza at intel.com>

> 
> Cc: José Roberto de Souza <jose.souza at intel.com>
> Signed-off-by: Matt Roper <matthew.d.roper at intel.com>
> ---
>  drivers/gpu/drm/i915/i915_gpu_error.c | 6 ++++--
>  1 file changed, 4 insertions(+), 2 deletions(-)
> 
> diff --git a/drivers/gpu/drm/i915/i915_gpu_error.c b/drivers/gpu/drm/i915/i915_gpu_error.c
> index b9f66dbd46bb..2a2d7643b551 100644
> --- a/drivers/gpu/drm/i915/i915_gpu_error.c
> +++ b/drivers/gpu/drm/i915/i915_gpu_error.c
> @@ -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] =