Commit 5bee1e2d authored by Ilia Levi's avatar Ilia Levi Committed by Lucas De Marchi
Browse files

drm/xe: s/xe_mmio_init/xe_mmio_probe_early 



Rename so that xe_mmio_init() can be used in subsequent patches to
initialize an instance of struct xe_mmio.

Signed-off-by: default avatarIlia Levi <ilia.levi@intel.com>
Reviewed-by: default avatarLucas De Marchi <lucas.demarchi@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20250130105057.136586-1-ilia.levi@intel.com


Signed-off-by: default avatarLucas De Marchi <lucas.demarchi@intel.com>
parent 339adeb1

drivers/gpu/drm/xe/xe_device.c

+1 −1
Original line number Diff line number Diff line
@@ -692,7 +692,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;

drivers/gpu/drm/xe/xe_mmio.c

+3 −3
Original line number Diff line number Diff line
@@ -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);

drivers/gpu/drm/xe/xe_mmio.h

+1 −1
Original line number Diff line number Diff line
@@ -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);