Commit dbc4f5d1 authored by Matt Roper's avatar Matt Roper Committed by Rodrigo Vivi
Browse files

drm/xe/mtl: Disable media GT 



Xe incorrectly conflates the concept of 'tile' and 'GT.'  Since MTL's
media support is not yet functioning properly, let's just disable it
completely for now while we fix the fundamental driver design.  Support
for media GTs on platforms like MTL will be re-added later.

v2:
 - Drop some unrelated code cleanup that didn't belong in this patch.
   (Lucas)
v3:
 - Drop unnecessary xe_gt.h include.  (Gustavo)

Cc: Lucas De Marchi <lucas.demarchi@intel.com>
Cc: Gustavo Sousa <gustavo.sousa@intel.com>
Reviewed-by: default avatarMatt Atwood <matthew.s.atwood@intel.com>
Reviewed-by: default avatarLucas De Marchi <lucas.demarchi@intel.com>
Acked-by: default avatarGustavo Sousa <gustavo.sousa@intel.com>
Link: https://lore.kernel.org/r/20230601215244.678611-2-matthew.d.roper@intel.com


Signed-off-by: default avatarMatt Roper <matthew.d.roper@intel.com>
Signed-off-by: default avatarRodrigo Vivi <rodrigo.vivi@intel.com>
parent dbd6c64c

drivers/gpu/drm/xe/xe_mmio.c

+0 −2
Original line number Diff line number Diff line
@@ -340,8 +340,6 @@ static void xe_mmio_probe_tiles(struct xe_device *xe) 
	mtcfg = xe_mmio_read64(gt, XEHP_MTCFG_ADDR);

	adj_tile_count = xe->info.tile_count =

		REG_FIELD_GET(TILE_COUNT, mtcfg) + 1;

	if (xe->info.media_verx100 >= 1300)

		xe->info.tile_count *= 2;



	drm_info(&xe->drm, "tile_count: %d, adj_tile_count %d\n",

		 xe->info.tile_count, adj_tile_count);

drivers/gpu/drm/xe/xe_pci.c

+0 −12
Original line number Diff line number Diff line
@@ -275,20 +275,10 @@ static const __maybe_unused struct xe_device_desc pvc_desc = { 
	.extra_gts = pvc_gts,

};



static const struct xe_gt_desc xelpmp_gts[] = {

	{

		.type = XE_GT_TYPE_MEDIA,

		.vram_id = 0,

		.mmio_adj_limit = 0x40000,

		.mmio_adj_offset = 0x380000,

	},

};



static const struct xe_device_desc mtl_desc = {

	/* .graphics and .media determined via GMD_ID */

	.require_force_probe = true,

	PLATFORM(XE_METEORLAKE),

	.extra_gts = xelpmp_gts,

};



#undef PLATFORM
@@ -545,8 +535,6 @@ static int xe_info_init(struct xe_device *xe, 
	 * treats it as the number of GTs rather than just the number of tiles.

	 */

	xe->info.tile_count = 1 + graphics_desc->max_remote_tiles;

	if (MEDIA_VER(xe) >= 13)

		xe->info.tile_count++;



	for (id = 0; id < xe->info.tile_count; ++id) {

		gt = xe->gt + id;