From: Matthew Auld Date: Fri, 31 Mar 2023 08:46:28 +0000 (+0100) Subject: drm/xe: fully turn on small-bar support X-Git-Tag: Ubuntu-6.8.0-17.17~1697^2~7^2~496 X-Git-Url: https://git.proxmox.com/?a=commitdiff_plain;h=c00ce7f22317006a3f14465637093ae3d2e53463;p=mirror_ubuntu-kernels.git drm/xe: fully turn on small-bar support This allows vram_size > io_size, instead of just clamping the vram size to the BAR size, now that the driver supports it. Signed-off-by: Matthew Auld Cc: Gwan-gyeong Mun Cc: Lucas De Marchi Cc: Michael J. Ruhl Reviewed-by: Maarten Lankhorst Reviewed-by: Gwan-gyeong Mun Signed-off-by: Rodrigo Vivi --- diff --git a/drivers/gpu/drm/xe/xe_mmio.c b/drivers/gpu/drm/xe/xe_mmio.c index 8d0f07261bfd..aa9c573b1243 100644 --- a/drivers/gpu/drm/xe/xe_mmio.c +++ b/drivers/gpu/drm/xe/xe_mmio.c @@ -261,11 +261,6 @@ int xe_mmio_probe_vram(struct xe_device *xe) if (err) return err; - /* small bar issues will only cover root tile sizes */ - if (xe->mem.vram.io_size < vram_size) - drm_warn(&xe->drm, "Restricting VRAM size to PCI resource size (0x%llx->0x%llx)\n", - vram_size, (u64)xe->mem.vram.io_size); - drm_info(&xe->drm, "VISIBLE VRAM: %pa, %pa\n", &xe->mem.vram.io_start, &xe->mem.vram.io_size); @@ -287,9 +282,7 @@ int xe_mmio_probe_vram(struct xe_device *xe) } tile->mem.vram.base = tile_offset; - - /* small bar can limit the visible size. size accordingly */ - tile->mem.vram.usable_size = min_t(u64, vram_size, io_size); + tile->mem.vram.usable_size = vram_size; tile->mem.vram.mapping = xe->mem.vram.mapping + tile_offset; drm_info(&xe->drm, "VRAM[%u, %u]: %pa, %pa\n", id, tile->id, @@ -304,7 +297,7 @@ int xe_mmio_probe_vram(struct xe_device *xe) available_size += vram_size; if (total_size > xe->mem.vram.io_size) { - drm_warn(&xe->drm, "VRAM: %pa is larger than resource %pa\n", + drm_info(&xe->drm, "VRAM: %pa is larger than resource %pa\n", &total_size, &xe->mem.vram.io_size); }