Commit ca8dcfed authored by Nitin Gote's avatar Nitin Gote Committed by Thomas Hellström
Browse files

drm/xe: derive mem copy capability from graphics version 



Drop .has_mem_copy_instr from the platform descriptors and set it
in xe_info_init() after handle_gmdid() populates graphics_verx100.
Centralizing the GRAPHICS_VER(xe) >= 20 check keeps MEM_COPY enabled
on Xe2+ and removes redundant per-platform plumbing.

Bspec: 57561

Fixes: 1e12dbae ("drm/xe/migrate: support MEM_COPY instruction")
Cc: Matt Roper <matthew.d.roper@intel.com>
Reviewed-by: default avatarMatthew Auld <matthew.auld@intel.com>
Suggested-by: default avatarMatthew Auld <matthew.auld@intel.com>
Signed-off-by: default avatarNitin Gote <nitin.r.gote@intel.com>
Link: https://patch.msgid.link/20260120054724.1982608-2-nitin.r.gote@intel.com


Signed-off-by: default avatarTejas Upadhyay <tejas.upadhyay@intel.com>
(cherry picked from commit 6ef02656)
Signed-off-by: default avatarThomas Hellström <thomas.hellstrom@linux.intel.com>
parent 051be491

drivers/gpu/drm/xe/xe_pci.c

+1 −5
Original line number Diff line number Diff line
@@ -342,7 +342,6 @@ static const struct xe_device_desc lnl_desc = { 
	.has_display = true,

	.has_flat_ccs = 1,

	.has_pxp = true,

	.has_mem_copy_instr = true,

	.max_gt_per_tile = 2,

	.needs_scratch = true,

	.va_bits = 48,
@@ -363,7 +362,6 @@ static const struct xe_device_desc bmg_desc = { 
	.has_heci_cscfi = 1,

	.has_late_bind = true,

	.has_sriov = true,

	.has_mem_copy_instr = true,

	.max_gt_per_tile = 2,

	.needs_scratch = true,

	.subplatforms = (const struct xe_subplatform_desc[]) {
@@ -380,7 +378,6 @@ static const struct xe_device_desc ptl_desc = { 
	.has_display = true,

	.has_flat_ccs = 1,

	.has_sriov = true,

	.has_mem_copy_instr = true,

	.max_gt_per_tile = 2,

	.needs_scratch = true,

	.needs_shared_vf_gt_wq = true,
@@ -393,7 +390,6 @@ static const struct xe_device_desc nvls_desc = { 
	.dma_mask_size = 46,

	.has_display = true,

	.has_flat_ccs = 1,

	.has_mem_copy_instr = true,

	.max_gt_per_tile = 2,

	.require_force_probe = true,

	.va_bits = 48,
@@ -675,7 +671,6 @@ static int xe_info_init_early(struct xe_device *xe, 
	xe->info.has_pxp = desc->has_pxp;

	xe->info.has_sriov = xe_configfs_primary_gt_allowed(to_pci_dev(xe->drm.dev)) &&

		desc->has_sriov;

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

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

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

	xe->info.skip_pcode = desc->skip_pcode;
@@ -864,6 +859,7 @@ static int xe_info_init(struct xe_device *xe, 
	xe->info.has_range_tlb_inval = graphics_desc->has_range_tlb_inval;

	xe->info.has_usm = graphics_desc->has_usm;

	xe->info.has_64bit_timestamp = graphics_desc->has_64bit_timestamp;

	xe->info.has_mem_copy_instr = GRAPHICS_VER(xe) >= 20;



	xe_info_probe_tile_count(xe);

drivers/gpu/drm/xe/xe_pci_types.h

+0 −1
Original line number Diff line number Diff line
@@ -46,7 +46,6 @@ struct xe_device_desc { 
	u8 has_late_bind:1;

	u8 has_llc:1;

	u8 has_mbx_power_limits:1;

	u8 has_mem_copy_instr:1;

	u8 has_pxp:1;

	u8 has_sriov:1;

	u8 needs_scratch:1;