drm/xe/pciids: separate RPL-U and RPL-P PCI IDs

[ Upstream commit d454902a690db47f1880f963514bbf0fc7a129a8 ]

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: Sai Teja Pottumuttu <sai.teja.pottumuttu@intel.com>
Signed-off-by: Jani Nikula <jani.nikula@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/4868d36fbfa8c38ea2d490bca82cf6370b8d65dd.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 5e962e72c97ea6cfec4511e96dfdf0b484b4f7e3..8563206f643e682e6ef0efce3cdc4c7d1edd37e7 100644 (file)
--- a/drivers/gpu/drm/xe/xe_pci.c
+++ b/drivers/gpu/drm/xe/xe_pci.c
@@ -383,6 +383,7 @@ static const struct pci_device_id pciidlist[] = {
        XE_ADLS_IDS(INTEL_VGA_DEVICE, &adl_s_desc),
        XE_ADLP_IDS(INTEL_VGA_DEVICE, &adl_p_desc),
        XE_ADLN_IDS(INTEL_VGA_DEVICE, &adl_n_desc),
+       XE_RPLU_IDS(INTEL_VGA_DEVICE, &adl_p_desc),
        XE_RPLP_IDS(INTEL_VGA_DEVICE, &adl_p_desc),
        XE_RPLS_IDS(INTEL_VGA_DEVICE, &adl_s_desc),
        XE_DG1_IDS(INTEL_VGA_DEVICE, &dg1_desc),

diff --git a/include/drm/intel/xe_pciids.h b/include/drm/intel/xe_pciids.h
index 644872a35c35263359f909d68053c196bcc1c31b..7ee7524141f1008d4b18ea2a111de4a072ceb69e 100644 (file)
--- a/include/drm/intel/xe_pciids.h
+++ b/include/drm/intel/xe_pciids.h
@@ -120,7 +120,6 @@
 
 /* RPL-P */
 #define XE_RPLP_IDS(MACRO__, ...)              \
-       XE_RPLU_IDS(MACRO__, ## __VA_ARGS__),   \
        MACRO__(0xA720, ## __VA_ARGS__),        \
        MACRO__(0xA7A0, ## __VA_ARGS__),        \
        MACRO__(0xA7A8, ## __VA_ARGS__),        \