diff options
| author | Michał Winiarski <[email protected]> | 2023-11-29 22:45:01 +0100 |
|---|---|---|
| committer | Rodrigo Vivi <[email protected]> | 2023-12-21 11:45:10 -0500 |
| commit | f4a0a113f103e23adb4f3ba8a0e02ce4973fdedf (patch) | |
| tree | c471bc5370cb6bb64aed3d1a37a78a160962ad77 | |
| parent | 01c2413a5bc2c66ab54b4aebd3078823a148e69e (diff) | |
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: Michał Winiarski <[email protected]>
Reviewed-by: Matthew Brost <[email protected]>
Link: https://lore.kernel.org/r/[email protected]
Signed-off-by: Rodrigo Vivi <[email protected]>
| -rw-r--r-- | drivers/gpu/drm/xe/xe_device.c | 2 | ||||
| -rw-r--r-- | drivers/gpu/drm/xe/xe_mmio.c | 4 | ||||
| -rw-r--r-- | drivers/gpu/drm/xe/xe_mmio.h | 1 |
3 files changed, 4 insertions, 3 deletions
diff --git a/drivers/gpu/drm/xe/xe_device.c b/drivers/gpu/drm/xe/xe_device.c index dcb087108393..785bf2e610b7 100644 --- a/drivers/gpu/drm/xe/xe_device.c +++ b/drivers/gpu/drm/xe/xe_device.c @@ -403,6 +403,8 @@ int xe_device_probe(struct xe_device *xe) if (err) return err; + xe_mmio_probe_tiles(xe); + err = drmm_add_action_or_reset(&xe->drm, xe_driver_flr_fini, xe); if (err) return err; diff --git a/drivers/gpu/drm/xe/xe_mmio.c b/drivers/gpu/drm/xe/xe_mmio.c index 43f322cd30a1..ab91be1405c9 100644 --- a/drivers/gpu/drm/xe/xe_mmio.c +++ b/drivers/gpu/drm/xe/xe_mmio.c @@ -295,7 +295,7 @@ int xe_mmio_probe_vram(struct xe_device *xe) 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; u8 id, tile_count = xe->info.tile_count; @@ -409,8 +409,6 @@ int xe_mmio_init(struct xe_device *xe) if (err) return err; - xe_mmio_probe_tiles(xe); - return 0; } diff --git a/drivers/gpu/drm/xe/xe_mmio.h b/drivers/gpu/drm/xe/xe_mmio.h index 218b796629ad..c054c27f6925 100644 --- a/drivers/gpu/drm/xe/xe_mmio.h +++ b/drivers/gpu/drm/xe/xe_mmio.h @@ -21,6 +21,7 @@ struct xe_device; #define LMEM_BAR 2 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) { |