Commit 498ecc54 authored by Matt Roper's avatar Matt Roper
Browse files

drm/xe/gt: Convert register access to use xe_mmio 



Stop using GT pointers for register access.

Reviewed-by: default avatarRodrigo Vivi <rodrigo.vivi@intel.com>
Signed-off-by: default avatarMatt Roper <matthew.d.roper@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20240910234719.3335472-81-matthew.d.roper@intel.com
parent 344c96b7

drivers/gpu/drm/xe/xe_gt.c

+5 −5
Original line number Diff line number Diff line
@@ -110,7 +110,7 @@ static void xe_gt_enable_host_l2_vram(struct xe_gt *gt) 
		return;



	if (!xe_gt_is_media_type(gt)) {

		xe_mmio_write32(gt, SCRATCH1LPFC, EN_L3_RW_CCS_CACHE_FLUSH);

		xe_mmio_write32(&gt->mmio, SCRATCH1LPFC, EN_L3_RW_CCS_CACHE_FLUSH);

		reg = xe_gt_mcr_unicast_read_any(gt, XE2_GAMREQSTRM_CTRL);

		reg |= CG_DIS_CNTLBUS;

		xe_gt_mcr_multicast_write(gt, XE2_GAMREQSTRM_CTRL, reg);
@@ -247,7 +247,7 @@ static int emit_wa_job(struct xe_gt *gt, struct xe_exec_queue *q) 
			else if (entry->clr_bits + 1)

				val = (reg.mcr ?

				       xe_gt_mcr_unicast_read_any(gt, reg_mcr) :

				       xe_mmio_read32(gt, reg)) & (~entry->clr_bits);

				       xe_mmio_read32(&gt->mmio, reg)) & (~entry->clr_bits);

			else

				val = 0;
@@ -442,7 +442,7 @@ static int gt_fw_domain_init(struct xe_gt *gt) 
	 * Stash hardware-reported version.  Since this register does not exist

	 * on pre-MTL platforms, reading it there will (correctly) return 0.

	 */

	gt->info.gmdid = xe_mmio_read32(gt, GMD_ID);

	gt->info.gmdid = xe_mmio_read32(&gt->mmio, GMD_ID);



	err = xe_force_wake_put(gt_to_fw(gt), XE_FW_GT);

	XE_WARN_ON(err);
@@ -652,8 +652,8 @@ static int do_gt_reset(struct xe_gt *gt) 


	xe_gsc_wa_14015076503(gt, true);



	xe_mmio_write32(gt, GDRST, GRDOM_FULL);

	err = xe_mmio_wait32(gt, GDRST, GRDOM_FULL, 0, 5000, NULL, false);

	xe_mmio_write32(&gt->mmio, GDRST, GRDOM_FULL);

	err = xe_mmio_wait32(&gt->mmio, GDRST, GRDOM_FULL, 0, 5000, NULL, false);

	if (err)

		xe_gt_err(gt, "failed to clear GRDOM_FULL (%pe)\n",

			  ERR_PTR(err));