Commit f4a0a113 authored by Michał Winiarski's avatar Michał Winiarski Committed by Rodrigo Vivi

drm/xe: Move xe_mmio_probe_tiles outside of MMIO setup

MMIO is going to be setup earlier during probe. Move xe_mmio_probe_tiles
outside of MMIO setup.
Signed-off-by: default avatarMichał Winiarski <michal.winiarski@intel.com>
Reviewed-by: default avatarMatthew Brost <matthew.brost@intel.com>
Link: https://lore.kernel.org/r/20231129214509.1174116-6-michal.winiarski@intel.comSigned-off-by: default avatarRodrigo Vivi <rodrigo.vivi@intel.com>
parent 01c2413a
...@@ -403,6 +403,8 @@ int xe_device_probe(struct xe_device *xe) ...@@ -403,6 +403,8 @@ int xe_device_probe(struct xe_device *xe)
if (err) if (err)
return err; return err;
xe_mmio_probe_tiles(xe);
err = drmm_add_action_or_reset(&xe->drm, xe_driver_flr_fini, xe); err = drmm_add_action_or_reset(&xe->drm, xe_driver_flr_fini, xe);
if (err) if (err)
return err; return err;
......
...@@ -295,7 +295,7 @@ int xe_mmio_probe_vram(struct xe_device *xe) ...@@ -295,7 +295,7 @@ int xe_mmio_probe_vram(struct xe_device *xe)
return 0; return 0;
} }
static void xe_mmio_probe_tiles(struct xe_device *xe) void xe_mmio_probe_tiles(struct xe_device *xe)
{ {
size_t tile_mmio_size = SZ_16M, tile_mmio_ext_size = xe->info.tile_mmio_ext_size; size_t tile_mmio_size = SZ_16M, tile_mmio_ext_size = xe->info.tile_mmio_ext_size;
u8 id, tile_count = xe->info.tile_count; u8 id, tile_count = xe->info.tile_count;
...@@ -409,8 +409,6 @@ int xe_mmio_init(struct xe_device *xe) ...@@ -409,8 +409,6 @@ int xe_mmio_init(struct xe_device *xe)
if (err) if (err)
return err; return err;
xe_mmio_probe_tiles(xe);
return 0; return 0;
} }
......
...@@ -21,6 +21,7 @@ struct xe_device; ...@@ -21,6 +21,7 @@ struct xe_device;
#define LMEM_BAR 2 #define LMEM_BAR 2
int xe_mmio_init(struct xe_device *xe); int xe_mmio_init(struct xe_device *xe);
void xe_mmio_probe_tiles(struct xe_device *xe);
static inline u8 xe_mmio_read8(struct xe_gt *gt, struct xe_reg reg) static inline u8 xe_mmio_read8(struct xe_gt *gt, struct xe_reg reg)
{ {
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment