Commit 70f02a2c authored by Matt Roper's avatar Matt Roper
Browse files

drm/xe/wopcm: 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-75-matthew.d.roper@intel.com
parent 0a3dee92

drivers/gpu/drm/xe/xe_wopcm.c

+6 −6
Original line number Diff line number Diff line
@@ -123,8 +123,8 @@ static bool __check_layout(struct xe_device *xe, u32 wopcm_size, 
static bool __wopcm_regs_locked(struct xe_gt *gt,

				u32 *guc_wopcm_base, u32 *guc_wopcm_size)

{

	u32 reg_base = xe_mmio_read32(gt, DMA_GUC_WOPCM_OFFSET);

	u32 reg_size = xe_mmio_read32(gt, GUC_WOPCM_SIZE);

	u32 reg_base = xe_mmio_read32(&gt->mmio, DMA_GUC_WOPCM_OFFSET);

	u32 reg_size = xe_mmio_read32(&gt->mmio, GUC_WOPCM_SIZE);



	if (!(reg_size & GUC_WOPCM_SIZE_LOCKED) ||

	    !(reg_base & GUC_WOPCM_OFFSET_VALID))
@@ -150,13 +150,13 @@ static int __wopcm_init_regs(struct xe_device *xe, struct xe_gt *gt, 
	XE_WARN_ON(size & ~GUC_WOPCM_SIZE_MASK);



	mask = GUC_WOPCM_SIZE_MASK | GUC_WOPCM_SIZE_LOCKED;

	err = xe_mmio_write32_and_verify(gt, GUC_WOPCM_SIZE, size, mask,

	err = xe_mmio_write32_and_verify(&gt->mmio, GUC_WOPCM_SIZE, size, mask,

					 size | GUC_WOPCM_SIZE_LOCKED);

	if (err)

		goto err_out;



	mask = GUC_WOPCM_OFFSET_MASK | GUC_WOPCM_OFFSET_VALID | huc_agent;

	err = xe_mmio_write32_and_verify(gt, DMA_GUC_WOPCM_OFFSET,

	err = xe_mmio_write32_and_verify(&gt->mmio, DMA_GUC_WOPCM_OFFSET,

					 base | huc_agent, mask,

					 base | huc_agent |

					 GUC_WOPCM_OFFSET_VALID);
@@ -169,10 +169,10 @@ static int __wopcm_init_regs(struct xe_device *xe, struct xe_gt *gt, 
	drm_notice(&xe->drm, "Failed to init uC WOPCM registers!\n");

	drm_notice(&xe->drm, "%s(%#x)=%#x\n", "DMA_GUC_WOPCM_OFFSET",

		   DMA_GUC_WOPCM_OFFSET.addr,

		   xe_mmio_read32(gt, DMA_GUC_WOPCM_OFFSET));

		   xe_mmio_read32(&gt->mmio, DMA_GUC_WOPCM_OFFSET));

	drm_notice(&xe->drm, "%s(%#x)=%#x\n", "GUC_WOPCM_SIZE",

		   GUC_WOPCM_SIZE.addr,

		   xe_mmio_read32(gt, GUC_WOPCM_SIZE));

		   xe_mmio_read32(&gt->mmio, GUC_WOPCM_SIZE));



	return err;

}