[PATCH i-g-t 08/10] lib: sync i915_pciids.h with kernel commit d2c4b1db1c4f

[Jani Nikula]

Synchronize i915_pciids.h with kernel commit:

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

and handle RPL-U separately in intel_device_info.c.

Signed-off-by: Jani Nikula <jani.nikula at intel.com>
---
 lib/i915_pciids.h       | 1 -
 lib/intel_device_info.c | 1 +
 2 files changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/i915_pciids.h b/lib/i915_pciids.h
index 42913d2eb655..04f6ca3dc5c1 100644
--- a/lib/i915_pciids.h
+++ b/lib/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), \
diff --git a/lib/intel_device_info.c b/lib/intel_device_info.c
index b1eec572dd82..4d05307ce3d7 100644
--- a/lib/intel_device_info.c
+++ b/lib/intel_device_info.c
@@ -609,6 +609,7 @@ static const struct pci_id_match intel_device_match[] = {
 	INTEL_ADLS_IDS(&intel_alderlake_s_info),
 	INTEL_RPLS_IDS(&intel_raptorlake_s_info),
 	INTEL_ADLP_IDS(&intel_alderlake_p_info),
+	INTEL_RPLU_IDS(&intel_alderlake_p_info),
 	INTEL_RPLP_IDS(&intel_alderlake_p_info),
 	INTEL_ADLN_IDS(&intel_alderlake_n_info),
 
-- 
2.39.2