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

[ Upstream commit cdb56a63f7eef34e89b045fc8bcae8d326bbdb19 ]

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: Shekhar Chauhan <shekhar.chauhan@intel.com>
Signed-off-by: Jani Nikula <jani.nikula@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/a30cb0da7694a8eccceba66d676ac59aa0e96176.1725443121.git.jani.nikula@intel.com
Signed-off-by: Sasha Levin <sashal@kernel.org>

diff --git a/drivers/gpu/drm/xe/xe_pci.c b/drivers/gpu/drm/xe/xe_pci.c
index 8563206f643e682e6ef0efce3cdc4c7d1edd37e7..025d649434673d881f6c47bcf420110be037a1f0 100644 (file)
--- a/drivers/gpu/drm/xe/xe_pci.c
+++ b/drivers/gpu/drm/xe/xe_pci.c
@@ -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),

diff --git a/include/drm/intel/xe_pciids.h b/include/drm/intel/xe_pciids.h
index 7ee7524141f1008d4b18ea2a111de4a072ceb69e..67dad09e62bc8c6d51b1a55d276ed4c6f5320cbf 100644 (file)
--- a/include/drm/intel/xe_pciids.h
+++ b/include/drm/intel/xe_pciids.h
@@ -174,16 +174,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__, ...) \