Commit cdb56a63 authored by Jani Nikula's avatar Jani Nikula
Browse files

drm/xe/pciids: separate ARL and MTL PCI IDs 



Avoid including PCI IDs for one platform to the PCI IDs of another. It's
more clear to deal with them completely separately at the PCI ID macro
level.

Reviewed-by: default avatarShekhar Chauhan <shekhar.chauhan@intel.com>
Signed-off-by: default avatarJani Nikula <jani.nikula@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/a30cb0da7694a8eccceba66d676ac59aa0e96176.1725443121.git.jani.nikula@intel.com
parent d454902a

drivers/gpu/drm/xe/xe_pci.c

+1 −0
Original line number Diff line number Diff line
@@ -388,6 +388,7 @@ static const struct pci_device_id pciidlist[] = { 
	XE_RPLS_IDS(INTEL_VGA_DEVICE, &adl_s_desc),

	XE_DG1_IDS(INTEL_VGA_DEVICE, &dg1_desc),

	XE_ATS_M_IDS(INTEL_VGA_DEVICE, &ats_m_desc),

	XE_ARL_IDS(INTEL_VGA_DEVICE, &mtl_desc),

	XE_DG2_IDS(INTEL_VGA_DEVICE, &dg2_desc),

	XE_MTL_IDS(INTEL_VGA_DEVICE, &mtl_desc),

	XE_LNL_IDS(INTEL_VGA_DEVICE, &lnl_desc),

include/drm/intel/xe_pciids.h

+8 −5
Original line number Diff line number Diff line
@@ -176,16 +176,19 @@ 
	XE_ATS_M150_IDS(MACRO__, ## __VA_ARGS__),\

	XE_ATS_M75_IDS(MACRO__, ## __VA_ARGS__)



/* MTL / ARL */

/* ARL */

#define XE_ARL_IDS(MACRO__, ...)		\

	MACRO__(0x7D41, ## __VA_ARGS__),	\

	MACRO__(0x7D51, ## __VA_ARGS__),        \

	MACRO__(0x7D67, ## __VA_ARGS__),	\

	MACRO__(0x7DD1, ## __VA_ARGS__)



/* MTL */

#define XE_MTL_IDS(MACRO__, ...)		\

	MACRO__(0x7D40, ## __VA_ARGS__),	\

	MACRO__(0x7D41, ## __VA_ARGS__),	\

	MACRO__(0x7D45, ## __VA_ARGS__),	\

	MACRO__(0x7D51, ## __VA_ARGS__),        \

	MACRO__(0x7D55, ## __VA_ARGS__),	\

	MACRO__(0x7D60, ## __VA_ARGS__),	\

	MACRO__(0x7D67, ## __VA_ARGS__),	\

	MACRO__(0x7DD1, ## __VA_ARGS__),        \

	MACRO__(0x7DD5, ## __VA_ARGS__)



#define XE_LNL_IDS(MACRO__, ...) \