aboutsummaryrefslogtreecommitdiff
path: root/drivers/gpu
diff options
context:
space:
mode:
authorMatthew Auld <matthew.auld@intel.com>2023-03-31 09:46:28 +0100
committerRodrigo Vivi <rodrigo.vivi@intel.com>2023-12-21 11:37:54 -0500
commitc00ce7f22317006a3f14465637093ae3d2e53463 (patch)
tree1db1a395933979d473182ce2191f58838ed2d53b /drivers/gpu
parentcd928fced9968558f1c7d724c23b1f8868c39774 (diff)
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 <matthew.auld@intel.com> Cc: Gwan-gyeong Mun <gwan-gyeong.mun@intel.com> Cc: Lucas De Marchi <lucas.demarchi@intel.com> Cc: Michael J. Ruhl <michael.j.ruhl@intel.com> Reviewed-by: Maarten Lankhorst <maarten.lankhorst@linux.intel.com> Reviewed-by: Gwan-gyeong Mun <gwan-gyeong.mun@intel.com> Signed-off-by: Rodrigo Vivi <rodrigo.vivi@intel.com>
Diffstat (limited to 'drivers/gpu')
-rw-r--r--drivers/gpu/drm/xe/xe_mmio.c11
1 files changed, 2 insertions, 9 deletions
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);
}