drm/xe/pciids: separate RPL-U and RPL-P 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: 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

diff --git a/drivers/gpu/drm/xe/xe_pci.c b/drivers/gpu/drm/xe/xe_pci.c
index 7eb00a87b786e47140c2d4c9b48417d4fadc1420..14fe08e40c983da8cd04dd00e49fb0f394f6c7c0 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 4aab1bc2327e38776409b927e03a7dbe172c6d52..7a9a7d0a89ca89b0fc7d625204eebbedde464a57 100644 (file)
--- a/include/drm/intel/xe_pciids.h
+++ b/include/drm/intel/xe_pciids.h
@@ -122,7 +122,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__),        \