drm/i915/pciids: don't include RPL-U PCI IDs in RPL-P

It's confusing for INTEL_RPLP_IDS() to include INTEL_RPLU_IDS(). Even if
we treat them the same elsewhere, the lists of PCI IDs should not.

Cc: Bjorn Helgaas <bhelgaas@google.com>
Cc: linux-pci@vger.kernel.org
Reviewed-by: Rodrigo Vivi <rodrigo.vivi@intel.com>
Acked-by: Bjorn Helgaas <bhelgaas@google.com>
Link: https://patchwork.freedesktop.org/patch/msgid/28fe0910efb93a28c400728af14beff015667f42.1715340032.git.jani.nikula@intel.com
Signed-off-by: Jani Nikula <jani.nikula@intel.com>

diff --git a/arch/x86/kernel/early-quirks.c b/arch/x86/kernel/early-quirks.c
index b2b9cc3b9545ce849b204bcb6e668b9bfe8a062d..fd74d7f26f01867f8f9c3cf242af044e97151168 100644 (file)
--- a/arch/x86/kernel/early-quirks.c
+++ b/arch/x86/kernel/early-quirks.c
@@ -556,6 +556,7 @@ static const struct pci_device_id intel_early_ids[] __initconst = {
        INTEL_ADLP_IDS(&gen11_early_ops),
        INTEL_ADLN_IDS(&gen11_early_ops),
        INTEL_RPLS_IDS(&gen11_early_ops),
+       INTEL_RPLU_IDS(&gen11_early_ops),
        INTEL_RPLP_IDS(&gen11_early_ops),
 };
 

diff --git a/drivers/gpu/drm/i915/display/intel_display_device.c b/drivers/gpu/drm/i915/display/intel_display_device.c
index fb4c4054207e9bc2768cb8a9a717685693c9ef96..89069cff06b444bb54b31a8d9f1d6b7077a37516 100644 (file)
--- a/drivers/gpu/drm/i915/display/intel_display_device.c
+++ b/drivers/gpu/drm/i915/display/intel_display_device.c
@@ -841,6 +841,7 @@ static const struct {
        INTEL_RPLS_IDS(&adl_s_display),
        INTEL_ADLP_IDS(&xe_lpd_display),
        INTEL_ADLN_IDS(&xe_lpd_display),
+       INTEL_RPLU_IDS(&xe_lpd_display),
        INTEL_RPLP_IDS(&xe_lpd_display),
        INTEL_DG2_IDS(&xe_hpd_display),
 

diff --git a/drivers/gpu/drm/i915/i915_pci.c b/drivers/gpu/drm/i915/i915_pci.c
index fe5cb3fcfe7372bbefd987fb11c7976cf6711ac5..0edd550d8555e6ecf628ab047e21f7db5c6701b9 100644 (file)
--- a/drivers/gpu/drm/i915/i915_pci.c
+++ b/drivers/gpu/drm/i915/i915_pci.c
@@ -867,6 +867,7 @@ static const struct pci_device_id pciidlist[] = {
        INTEL_ADLN_IDS(&adl_p_info),
        INTEL_DG1_IDS(&dg1_info),
        INTEL_RPLS_IDS(&adl_s_info),
+       INTEL_RPLU_IDS(&adl_p_info),
        INTEL_RPLP_IDS(&adl_p_info),
        INTEL_DG2_IDS(&dg2_info),
        INTEL_ATS_M_IDS(&ats_m_info),

diff --git a/drivers/gpu/drm/i915/intel_device_info.c b/drivers/gpu/drm/i915/intel_device_info.c
index 64651a54a245ae9507c7bb5c9f0efe11456d9ebf..a394979719940a2e3ba4f4d72ec6e6dd959e529e 100644 (file)
--- a/drivers/gpu/drm/i915/intel_device_info.c
+++ b/drivers/gpu/drm/i915/intel_device_info.c
@@ -182,6 +182,7 @@ static const u16 subplatform_n_ids[] = {
 
 static const u16 subplatform_rpl_ids[] = {
        INTEL_RPLS_IDS(0),
+       INTEL_RPLU_IDS(0),
        INTEL_RPLP_IDS(0),
 };
 

diff --git a/include/drm/i915_pciids.h b/include/drm/i915_pciids.h
index 42913d2eb655dad7e006cdd946561cc1fbc27992..04f6ca3dc5c13c47220c7f53dee578b25a57c864 100644 (file)
--- a/include/drm/i915_pciids.h
+++ b/include/drm/i915_pciids.h
@@ -717,7 +717,6 @@
 
 /* RPL-P */
 #define INTEL_RPLP_IDS(info) \
-       INTEL_RPLU_IDS(info), \
        INTEL_VGA_DEVICE(0xA720, info), \
        INTEL_VGA_DEVICE(0xA7A0, info), \
        INTEL_VGA_DEVICE(0xA7A8, info), \