[PATCH 1/2] drm/xe: s/xe_mmio_init/xe_mmio_probe_early

[Lucas De Marchi]

On Thu, Jan 30, 2025 at 12:50:56PM +0200, Ilia Levi wrote:
>Rename so that xe_mmio_init() can be used in subsequent patches to
>initialize an instance of struct xe_mmio.
>
>Signed-off-by: Ilia Levi <ilia.levi at intel.com>

Thanks for patches and reviews. Both patches applied to drm-xe-next.

[1/2] drm/xe: s/xe_mmio_init/xe_mmio_probe_early
       commit: 5bee1e2de39fe41be132ee389529407212894582
[2/2] drm/xe: Add xe_mmio_init() initialization function
       commit: eb79d71e506a1caeb0dedd1bab0e6899e8e74f5b

Lucas De Marchi

>---
> drivers/gpu/drm/xe/xe_device.c | 2 +-
> drivers/gpu/drm/xe/xe_mmio.c   | 6 +++---
> drivers/gpu/drm/xe/xe_mmio.h   | 2 +-
> 3 files changed, 5 insertions(+), 5 deletions(-)
>
>diff --git a/drivers/gpu/drm/xe/xe_device.c b/drivers/gpu/drm/xe/xe_device.c
>index 8fedc72e9db4..f6c01028c527 100644
>--- a/drivers/gpu/drm/xe/xe_device.c
>+++ b/drivers/gpu/drm/xe/xe_device.c
>@@ -685,7 +685,7 @@ int xe_device_probe_early(struct xe_device *xe)
> {
> 	int err;
>
>-	err = xe_mmio_init(xe);
>+	err = xe_mmio_probe_early(xe);
> 	if (err)
> 		return err;
>
>diff --git a/drivers/gpu/drm/xe/xe_mmio.c b/drivers/gpu/drm/xe/xe_mmio.c
>index d321a21aacf0..3aed849a128b 100644
>--- a/drivers/gpu/drm/xe/xe_mmio.c
>+++ b/drivers/gpu/drm/xe/xe_mmio.c
>@@ -60,7 +60,7 @@ static void mmio_multi_tile_setup(struct xe_device *xe, size_t tile_mmio_size)
>
> 	/*
> 	 * Nothing to be done as tile 0 has already been setup earlier with the
>-	 * entire BAR mapped - see xe_mmio_init()
>+	 * entire BAR mapped - see xe_mmio_probe_early()
> 	 */
> 	if (xe->info.tile_count == 1)
> 		return;
>@@ -74,7 +74,7 @@ static void mmio_multi_tile_setup(struct xe_device *xe, size_t tile_mmio_size)
> 		/*
> 		 * Although the per-tile mmio regs are not yet initialized, this
> 		 * is fine as it's going to the root tile's mmio, that's
>-		 * guaranteed to be initialized earlier in xe_mmio_init()
>+		 * guaranteed to be initialized earlier in xe_mmio_probe_early()
> 		 */
> 		mtcfg = xe_mmio_read64_2x32(mmio, XEHP_MTCFG_ADDR);
> 		tile_count = REG_FIELD_GET(TILE_COUNT, mtcfg) + 1;
>@@ -122,7 +122,7 @@ static void mmio_fini(void *arg)
> 	root_tile->mmio.regs = NULL;
> }
>
>-int xe_mmio_init(struct xe_device *xe)
>+int xe_mmio_probe_early(struct xe_device *xe)
> {
> 	struct xe_tile *root_tile = xe_device_get_root_tile(xe);
> 	struct pci_dev *pdev = to_pci_dev(xe->drm.dev);
>diff --git a/drivers/gpu/drm/xe/xe_mmio.h b/drivers/gpu/drm/xe/xe_mmio.h
>index 8a46f4006a84..b32e7ee4b23e 100644
>--- a/drivers/gpu/drm/xe/xe_mmio.h
>+++ b/drivers/gpu/drm/xe/xe_mmio.h
>@@ -11,7 +11,7 @@
> struct xe_device;
> struct xe_reg;
>
>-int xe_mmio_init(struct xe_device *xe);
>+int xe_mmio_probe_early(struct xe_device *xe);
> int xe_mmio_probe_tiles(struct xe_device *xe);
>
> u8 xe_mmio_read8(struct xe_mmio *mmio, struct xe_reg reg);
>-- 
>2.43.2
>