Commit e50bbbb9 authored by Lucas De Marchi's avatar Lucas De Marchi Committed by Rodrigo Vivi
Browse files

drm/xe: Remove duplicate media_ver 

media_verx100 supersedes the info from media_ver. Leave media_ver in the
struct xe_device_desc, used in xe_pci.c since it's easier to define
common parts of the platforms like that. However all the rest of the
driver should be using media_verx100 that is more future proof.

Closes: https://gitlab.freedesktop.org/drm/xe/kernel/-/issues/216


Signed-off-by: default avatarLucas De Marchi <lucas.demarchi@intel.com>
Reviewed-by: default avatarJosé Roberto de Souza <jose.souza@intel.com>
Signed-off-by: default avatarRodrigo Vivi <rodrigo.vivi@intel.com>
parent cb30cfdc

drivers/gpu/drm/xe/xe_device_types.h

+0 −2
Original line number Diff line number Diff line
@@ -77,8 +77,6 @@ struct xe_device { 
		u8 tile_count;

		/** @vm_max_level: Max VM level */

		u8 vm_max_level;

		/** @media_ver: Media version */

		u8 media_ver;

		/** @supports_usm: Supports unified shared memory */

		bool supports_usm;

		/** @has_asid: Has address space ID */

drivers/gpu/drm/xe/xe_mmio.c

+1 −1
Original line number Diff line number Diff line
@@ -287,7 +287,7 @@ static void xe_mmio_probe_tiles(struct xe_device *xe) 
	mtcfg = xe_mmio_read64(gt, XEHP_MTCFG_ADDR.reg);

	adj_tile_count = xe->info.tile_count =

		REG_FIELD_GET(TILE_COUNT, mtcfg) + 1;

	if (xe->info.media_ver >= 13)

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

		xe->info.tile_count *= 2;



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

drivers/gpu/drm/xe/xe_pci.c

+0 −1
Original line number Diff line number Diff line
@@ -408,7 +408,6 @@ static int xe_pci_probe(struct pci_dev *pdev, const struct pci_device_id *ent) 
	xe->info.vram_flags = desc->vram_flags;

	xe->info.tile_count = desc->max_tiles;

	xe->info.vm_max_level = desc->vm_max_level;

	xe->info.media_ver = desc->media_ver;

	xe->info.supports_usm = desc->supports_usm;

	xe->info.has_asid = desc->has_asid;

	xe->info.has_flat_ccs = desc->has_flat_ccs;