Commit c00ce7f2 authored by Matthew Auld's avatar Matthew Auld Committed by Rodrigo Vivi
Browse files

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: default avatarMatthew 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: default avatarMaarten Lankhorst <maarten.lankhorst@linux.intel.com>
Reviewed-by: default avatarGwan-gyeong Mun <gwan-gyeong.mun@intel.com>
Signed-off-by: default avatarRodrigo Vivi <rodrigo.vivi@intel.com>
parent cd928fce

drivers/gpu/drm/xe/xe_mmio.c

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

		}