From f170abf110ad7994bade885eef4101c9ef161581 Mon Sep 17 00:00:00 2001
From: jsg <jsg@openbsd.org>
Date: Sun, 26 Nov 2023 05:47:21 +0000
Subject: [PATCH] drm/i915/rpl: Update pci ids for RPL P/U

From Dnyaneshwar Bhadane
5d5fea7c79a7f7b61a9683784c83d539aca8dafe in mainline linux
---
 sys/dev/pci/drm/i915/i915_devlist.h       | 10 +++++++---
 sys/dev/pci/drm/include/drm/i915_pciids.h | 14 +++++++++++---
 sys/dev/pci/pcidevs                       | 16 ++++++++++------
 3 files changed, 28 insertions(+), 12 deletions(-)

diff --git a/sys/dev/pci/drm/i915/i915_devlist.h b/sys/dev/pci/drm/i915/i915_devlist.h
index 0b0dfba5b30..5650489013f 100644
--- a/sys/dev/pci/drm/i915/i915_devlist.h
+++ b/sys/dev/pci/drm/i915/i915_devlist.h
@@ -309,10 +309,14 @@ static const struct pci_matchid i915_devices[] = {
 	{ 0x8086, 0xa789 },
 	{ 0x8086, 0xa78a },
 	{ 0x8086, 0xa78b },
-	{ 0x8086, 0xa720 },
 	{ 0x8086, 0xa721 },
-	{ 0x8086, 0xa7a0 },
 	{ 0x8086, 0xa7a1 },
-	{ 0x8086, 0xa7a8 },
 	{ 0x8086, 0xa7a9 },
+	{ 0x8086, 0xa7ac },
+	{ 0x8086, 0xa7ad },
+	{ 0x8086, 0xa720 },
+	{ 0x8086, 0xa7a0 },
+	{ 0x8086, 0xa7a8 },
+	{ 0x8086, 0xa7aa },
+	{ 0x8086, 0xa7ab },
 };
diff --git a/sys/dev/pci/drm/include/drm/i915_pciids.h b/sys/dev/pci/drm/include/drm/i915_pciids.h
index 9c325c6b8df..21faa73db7e 100644
--- a/sys/dev/pci/drm/include/drm/i915_pciids.h
+++ b/sys/dev/pci/drm/include/drm/i915_pciids.h
@@ -685,14 +685,22 @@
 	INTEL_VGA_DEVICE(0xA78A, info), \
 	INTEL_VGA_DEVICE(0xA78B, info)
 
+/* RPL-U */
+#define INTEL_RPLU_IDS(info) \
+	INTEL_VGA_DEVICE(0xA721, info), \
+	INTEL_VGA_DEVICE(0xA7A1, info), \
+	INTEL_VGA_DEVICE(0xA7A9, info), \
+	INTEL_VGA_DEVICE(0xA7AC, info), \
+	INTEL_VGA_DEVICE(0xA7AD, info)
+
 /* RPL-P */
 #define INTEL_RPLP_IDS(info) \
+	INTEL_RPLU_IDS(info), \
 	INTEL_VGA_DEVICE(0xA720, info), \
-	INTEL_VGA_DEVICE(0xA721, info), \
 	INTEL_VGA_DEVICE(0xA7A0, info), \
-	INTEL_VGA_DEVICE(0xA7A1, info), \
 	INTEL_VGA_DEVICE(0xA7A8, info), \
-	INTEL_VGA_DEVICE(0xA7A9, info)
+	INTEL_VGA_DEVICE(0xA7AA, info), \
+	INTEL_VGA_DEVICE(0xA7AB, info)
 
 /* DG2 */
 #define INTEL_DG2_G10_IDS(info) \
diff --git a/sys/dev/pci/pcidevs b/sys/dev/pci/pcidevs
index 20471dd74a4..4662f0da3e1 100644
--- a/sys/dev/pci/pcidevs
+++ b/sys/dev/pci/pcidevs
@@ -1,4 +1,4 @@
-$OpenBSD: pcidevs,v 1.2056 2023/11/24 04:34:09 jmatthew Exp $
+$OpenBSD: pcidevs,v 1.2057 2023/11/26 05:47:21 jsg Exp $
 /*	$NetBSD: pcidevs,v 1.30 1997/06/24 06:20:24 thorpej Exp $	*/
 
 /*
@@ -7026,7 +7026,7 @@ product INTEL RPL_DTT		0xa71d	Core 13G DTT
 product INTEL RPL_XHCI		0xa71e	Core 13G xHCI
 product INTEL RPL_TBT_PCIE3	0xa71f	Core 13G PCIE
 product INTEL RPL_P_GT_1	0xa720	Graphics
-product INTEL RPL_P_GT_2	0xa721	Graphics
+product INTEL RPL_U_GT_1	0xa721	Graphics
 product INTEL RPL_HX_HB_4	0xa728	Core 13G Host
 product INTEL RPL_HX_HB_5	0xa729	Core 13G Host
 product INTEL RPL_HX_HB_6	0xa72a	Core 13G Host
@@ -7050,10 +7050,14 @@ product INTEL RPL_S_GT_5	0xa788	Graphics
 product INTEL RPL_S_GT_6	0xa789	Graphics
 product INTEL RPL_S_GT_7	0xa78a	Graphics
 product INTEL RPL_S_GT_8	0xa78b	Graphics
-product INTEL RPL_P_GT_3	0xa7a0	Graphics
-product INTEL RPL_P_GT_4	0xa7a1	Graphics
-product INTEL RPL_P_GT_5	0xa7a8	Graphics
-product INTEL RPL_P_GT_6	0xa7a9	Graphics
+product INTEL RPL_P_GT_2	0xa7a0	Graphics
+product INTEL RPL_U_GT_2	0xa7a1	Graphics
+product INTEL RPL_P_GT_3	0xa7a8	Graphics
+product INTEL RPL_U_GT_3	0xa7a9	Graphics
+product INTEL RPL_P_GT_4	0xa7aa	Graphics
+product INTEL RPL_P_GT_5	0xa7ab	Graphics
+product INTEL RPL_U_GT_4	0xa7ac	Graphics
+product INTEL RPL_U_GT_5	0xa7ad	Graphics
 product INTEL 21152		0xb152	S21152BB
 product INTEL 21154		0xb154	21154AE/BE
 product INTEL CORE_DMI_0	0xd130	Core DMI
-- 
2.20.1