public inbox for igt-dev@lists.freedesktop.org
 help / color / mirror / Atom feed
* [igt-dev] [PATCH i-g-t v3] lib: Sync i915_pciids.h with kernel
@ 2020-03-27  0:23 Swathi Dhanavanthri
  2020-03-27  1:11 ` [igt-dev] ✓ Fi.CI.BAT: success for lib: sync i915_pciids.h with kernel (rev6) Patchwork
                   ` (2 more replies)
  0 siblings, 3 replies; 4+ messages in thread
From: Swathi Dhanavanthri @ 2020-03-27  0:23 UTC (permalink / raw)
  To: igt-dev

Changes:
3882581753d1 ("drm/i915/tgl: Add new PCI IDs to TGL")
v2: Separated U series CML IDs to be in sync with kernel
8717c6b7414f ("Separate U series pci id from origianl list")
v3: Updating lib/intel_device_info.c with the U series

Signed-off-by: Swathi Dhanavanthri <swathi.dhanavanthri@intel.com>
---
 lib/i915_pciids.h       | 32 +++++++++++++++++++-------------
 lib/intel_device_info.c |  2 ++
 2 files changed, 21 insertions(+), 13 deletions(-)

diff --git a/lib/i915_pciids.h b/lib/i915_pciids.h
index 3e26a917..662d8351 100644
--- a/lib/i915_pciids.h
+++ b/lib/i915_pciids.h
@@ -446,23 +446,18 @@
 
 /* CML GT1 */
 #define INTEL_CML_GT1_IDS(info)	\
-	INTEL_VGA_DEVICE(0x9B21, info), \
-	INTEL_VGA_DEVICE(0x9BAA, info), \
-	INTEL_VGA_DEVICE(0x9BAB, info), \
-	INTEL_VGA_DEVICE(0x9BAC, info), \
-	INTEL_VGA_DEVICE(0x9BA0, info), \
 	INTEL_VGA_DEVICE(0x9BA5, info), \
 	INTEL_VGA_DEVICE(0x9BA8, info), \
 	INTEL_VGA_DEVICE(0x9BA4, info), \
 	INTEL_VGA_DEVICE(0x9BA2, info)
 
+#define INTEL_CML_U_GT1_IDS(info) \
+	INTEL_VGA_DEVICE(0x9B21, info), \
+	INTEL_VGA_DEVICE(0x9BAA, info), \
+	INTEL_VGA_DEVICE(0x9BAC, info)
+
 /* CML GT2 */
 #define INTEL_CML_GT2_IDS(info)	\
-	INTEL_VGA_DEVICE(0x9B41, info), \
-	INTEL_VGA_DEVICE(0x9BCA, info), \
-	INTEL_VGA_DEVICE(0x9BCB, info), \
-	INTEL_VGA_DEVICE(0x9BCC, info), \
-	INTEL_VGA_DEVICE(0x9BC0, info), \
 	INTEL_VGA_DEVICE(0x9BC5, info), \
 	INTEL_VGA_DEVICE(0x9BC8, info), \
 	INTEL_VGA_DEVICE(0x9BC4, info), \
@@ -471,6 +466,11 @@
 	INTEL_VGA_DEVICE(0x9BE6, info), \
 	INTEL_VGA_DEVICE(0x9BF6, info)
 
+#define INTEL_CML_U_GT2_IDS(info) \
+	INTEL_VGA_DEVICE(0x9B41, info), \
+	INTEL_VGA_DEVICE(0x9BCA, info), \
+	INTEL_VGA_DEVICE(0x9BCC, info)
+
 #define INTEL_KBL_IDS(info) \
 	INTEL_KBL_GT1_IDS(info), \
 	INTEL_KBL_GT2_IDS(info), \
@@ -536,7 +536,9 @@
 	INTEL_WHL_U_GT3_IDS(info), \
 	INTEL_AML_CFL_GT2_IDS(info), \
 	INTEL_CML_GT1_IDS(info), \
-	INTEL_CML_GT2_IDS(info)
+	INTEL_CML_GT2_IDS(info), \
+	INTEL_CML_U_GT1_IDS(info), \
+	INTEL_CML_U_GT2_IDS(info)
 
 /* CNL */
 #define INTEL_CNL_PORT_F_IDS(info) \
@@ -591,12 +593,16 @@
 
 /* TGL */
 #define INTEL_TGL_12_IDS(info) \
-	INTEL_VGA_DEVICE(0x9A49, info), \
 	INTEL_VGA_DEVICE(0x9A40, info), \
+	INTEL_VGA_DEVICE(0x9A49, info), \
 	INTEL_VGA_DEVICE(0x9A59, info), \
 	INTEL_VGA_DEVICE(0x9A60, info), \
 	INTEL_VGA_DEVICE(0x9A68, info), \
 	INTEL_VGA_DEVICE(0x9A70, info), \
-	INTEL_VGA_DEVICE(0x9A78, info)
+	INTEL_VGA_DEVICE(0x9A78, info), \
+	INTEL_VGA_DEVICE(0x9AC0, info), \
+	INTEL_VGA_DEVICE(0x9AC9, info), \
+	INTEL_VGA_DEVICE(0x9AD9, info), \
+	INTEL_VGA_DEVICE(0x9AF8, info)
 
 #endif /* _I915_PCIIDS_H */
diff --git a/lib/intel_device_info.c b/lib/intel_device_info.c
index 208965d1..21f7a957 100644
--- a/lib/intel_device_info.c
+++ b/lib/intel_device_info.c
@@ -395,6 +395,8 @@ static const struct pci_id_match intel_device_match[] = {
 
 	INTEL_CML_GT1_IDS(&intel_cometlake_gt1_info),
 	INTEL_CML_GT2_IDS(&intel_cometlake_gt2_info),
+	INTEL_CML_U_GT1_IDS(&intel_cometlake_gt1_info),
+	INTEL_CML_U_GT2_IDS(&intel_cometlake_gt2_info),
 
 	INTEL_CNL_IDS(&intel_cannonlake_info),
 
-- 
2.20.1

_______________________________________________
igt-dev mailing list
igt-dev@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/igt-dev

^ permalink raw reply related	[flat|nested] 4+ messages in thread
end of thread, other threads:[~2020-03-31 20:54 UTC | newest]

Thread overview: 4+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2020-03-27  0:23 [igt-dev] [PATCH i-g-t v3] lib: Sync i915_pciids.h with kernel Swathi Dhanavanthri
2020-03-27  1:11 ` [igt-dev] ✓ Fi.CI.BAT: success for lib: sync i915_pciids.h with kernel (rev6) Patchwork
2020-03-27 14:15 ` [igt-dev] ✓ Fi.CI.IGT: " Patchwork
2020-03-31 20:54 ` [igt-dev] [PATCH i-g-t v3] lib: Sync i915_pciids.h with kernel Matt Roper

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox