[PATCH v2 27/43] drm/xe/hw_engine: Convert register access to use xe_mmio

[Rodrigo Vivi]

On Fri, Sep 06, 2024 at 05:08:16PM -0700, Matt Roper wrote:
> Stop using GT pointers for register access.

Reviewed-by: Rodrigo Vivi <rodrigo.vivi at intel.com>

> 
> Signed-off-by: Matt Roper <matthew.d.roper at intel.com>
> ---
>  drivers/gpu/drm/xe/xe_hw_engine.c | 29 +++++++++++++++--------------
>  1 file changed, 15 insertions(+), 14 deletions(-)
> 
> diff --git a/drivers/gpu/drm/xe/xe_hw_engine.c b/drivers/gpu/drm/xe/xe_hw_engine.c
> index c9c3beb3ce8d..0788c2347c84 100644
> --- a/drivers/gpu/drm/xe/xe_hw_engine.c
> +++ b/drivers/gpu/drm/xe/xe_hw_engine.c
> @@ -295,7 +295,7 @@ void xe_hw_engine_mmio_write32(struct xe_hw_engine *hwe,
>  
>  	reg.addr += hwe->mmio_base;
>  
> -	xe_mmio_write32(hwe->gt, reg, val);
> +	xe_mmio_write32(&hwe->gt->mmio, reg, val);
>  }
>  
>  /**
> @@ -315,7 +315,7 @@ u32 xe_hw_engine_mmio_read32(struct xe_hw_engine *hwe, struct xe_reg reg)
>  
>  	reg.addr += hwe->mmio_base;
>  
> -	return xe_mmio_read32(hwe->gt, reg);
> +	return xe_mmio_read32(&hwe->gt->mmio, reg);
>  }
>  
>  void xe_hw_engine_enable_ring(struct xe_hw_engine *hwe)
> @@ -324,7 +324,7 @@ void xe_hw_engine_enable_ring(struct xe_hw_engine *hwe)
>  		xe_hw_engine_mask_per_class(hwe->gt, XE_ENGINE_CLASS_COMPUTE);
>  
>  	if (hwe->class == XE_ENGINE_CLASS_COMPUTE && ccs_mask)
> -		xe_mmio_write32(hwe->gt, RCU_MODE,
> +		xe_mmio_write32(&hwe->gt->mmio, RCU_MODE,
>  				_MASKED_BIT_ENABLE(RCU_MODE_CCS_ENABLE));
>  
>  	xe_hw_engine_mmio_write32(hwe, RING_HWSTAM(0), ~0x0);
> @@ -354,7 +354,7 @@ static bool xe_rtp_cfeg_wmtp_disabled(const struct xe_gt *gt,
>  	    hwe->class != XE_ENGINE_CLASS_RENDER)
>  		return false;
>  
> -	return xe_mmio_read32(hwe->gt, XEHP_FUSE4) & CFEG_WMTP_DISABLE;
> +	return xe_mmio_read32(&hwe->gt->mmio, XEHP_FUSE4) & CFEG_WMTP_DISABLE;
>  }
>  
>  void
> @@ -612,7 +612,7 @@ static void read_media_fuses(struct xe_gt *gt)
>  
>  	xe_force_wake_assert_held(gt_to_fw(gt), XE_FW_GT);
>  
> -	media_fuse = xe_mmio_read32(gt, GT_VEBOX_VDBOX_DISABLE);
> +	media_fuse = xe_mmio_read32(&gt->mmio, GT_VEBOX_VDBOX_DISABLE);
>  
>  	/*
>  	 * Pre-Xe_HP platforms had register bits representing absent engines,
> @@ -657,7 +657,7 @@ static void read_copy_fuses(struct xe_gt *gt)
>  
>  	xe_force_wake_assert_held(gt_to_fw(gt), XE_FW_GT);
>  
> -	bcs_mask = xe_mmio_read32(gt, MIRROR_FUSE3);
> +	bcs_mask = xe_mmio_read32(&gt->mmio, MIRROR_FUSE3);
>  	bcs_mask = REG_FIELD_GET(MEML3_EN_MASK, bcs_mask);
>  
>  	/* BCS0 is always present; only BCS1-BCS8 may be fused off */
> @@ -704,7 +704,7 @@ static void read_compute_fuses_from_reg(struct xe_gt *gt)
>  	struct xe_device *xe = gt_to_xe(gt);
>  	u32 ccs_mask;
>  
> -	ccs_mask = xe_mmio_read32(gt, XEHP_FUSE4);
> +	ccs_mask = xe_mmio_read32(&gt->mmio, XEHP_FUSE4);
>  	ccs_mask = REG_FIELD_GET(CCS_EN_MASK, ccs_mask);
>  
>  	for (int i = XE_HW_ENGINE_CCS0, j = 0; i <= XE_HW_ENGINE_CCS3; ++i, ++j) {
> @@ -742,8 +742,8 @@ static void check_gsc_availability(struct xe_gt *gt)
>  		gt->info.engine_mask &= ~BIT(XE_HW_ENGINE_GSCCS0);
>  
>  		/* interrupts where previously enabled, so turn them off */
> -		xe_mmio_write32(gt, GUNIT_GSC_INTR_ENABLE, 0);
> -		xe_mmio_write32(gt, GUNIT_GSC_INTR_MASK, ~0);
> +		xe_mmio_write32(&gt->mmio, GUNIT_GSC_INTR_ENABLE, 0);
> +		xe_mmio_write32(&gt->mmio, GUNIT_GSC_INTR_MASK, ~0);
>  
>  		drm_info(&xe->drm, "gsccs disabled due to lack of FW\n");
>  	}
> @@ -809,6 +809,7 @@ xe_hw_engine_snapshot_instdone_capture(struct xe_hw_engine *hwe,
>  				       struct xe_hw_engine_snapshot *snapshot)
>  {
>  	struct xe_gt *gt = hwe->gt;
> +	struct xe_mmio *mmio = &gt->mmio;
>  	struct xe_device *xe = gt_to_xe(gt);
>  	unsigned int dss;
>  	u16 group, instance;
> @@ -820,11 +821,11 @@ xe_hw_engine_snapshot_instdone_capture(struct xe_hw_engine *hwe,
>  
>  	if (is_slice_common_per_gslice(xe) == false) {
>  		snapshot->reg.instdone.slice_common[0] =
> -			xe_mmio_read32(gt, SC_INSTDONE);
> +			xe_mmio_read32(mmio, SC_INSTDONE);
>  		snapshot->reg.instdone.slice_common_extra[0] =
> -			xe_mmio_read32(gt, SC_INSTDONE_EXTRA);
> +			xe_mmio_read32(mmio, SC_INSTDONE_EXTRA);
>  		snapshot->reg.instdone.slice_common_extra2[0] =
> -			xe_mmio_read32(gt, SC_INSTDONE_EXTRA2);
> +			xe_mmio_read32(mmio, SC_INSTDONE_EXTRA2);
>  	} else {
>  		for_each_geometry_dss(dss, gt, group, instance) {
>  			snapshot->reg.instdone.slice_common[dss] =
> @@ -959,7 +960,7 @@ xe_hw_engine_snapshot_capture(struct xe_hw_engine *hwe)
>  	xe_hw_engine_snapshot_instdone_capture(hwe, snapshot);
>  
>  	if (snapshot->hwe->class == XE_ENGINE_CLASS_COMPUTE)
> -		snapshot->reg.rcu_mode = xe_mmio_read32(hwe->gt, RCU_MODE);
> +		snapshot->reg.rcu_mode = xe_mmio_read32(&hwe->gt->mmio, RCU_MODE);
>  
>  	return snapshot;
>  }
> @@ -1150,7 +1151,7 @@ const char *xe_hw_engine_class_to_str(enum xe_engine_class class)
>  
>  u64 xe_hw_engine_read_timestamp(struct xe_hw_engine *hwe)
>  {
> -	return xe_mmio_read64_2x32(hwe->gt, RING_TIMESTAMP(hwe->mmio_base));
> +	return xe_mmio_read64_2x32(&hwe->gt->mmio, RING_TIMESTAMP(hwe->mmio_base));
>  }
>  
>  enum xe_force_wake_domains xe_hw_engine_to_fw_domain(struct xe_hw_engine *hwe)
> -- 
> 2.45.2
>