Merge tag '5.6-rc-small-smb3-fix-for-stable' of git://git.samba.org/sfrench/cifs-2.6

[linux.git] / include / drm / i915_pciids.h

diff --git a/include/drm/i915_pciids.h b/include/drm/i915_pciids.h
index b1f66b117c74f5230be0c642338f1bb1d813bbe3..1d2c12219f44558db58dbb3d7713d389b319414e 100644 (file)
--- a/include/drm/i915_pciids.h
+++ b/include/drm/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) \
@@ -579,12 +581,15 @@
        INTEL_VGA_DEVICE(0x8A51, info), \
        INTEL_VGA_DEVICE(0x8A5D, info)
 
-/* EHL */
+/* EHL/JSL */
 #define INTEL_EHL_IDS(info) \
        INTEL_VGA_DEVICE(0x4500, info), \
        INTEL_VGA_DEVICE(0x4571, info), \
        INTEL_VGA_DEVICE(0x4551, info), \
-       INTEL_VGA_DEVICE(0x4541, info)
+       INTEL_VGA_DEVICE(0x4541, info), \
+       INTEL_VGA_DEVICE(0x4E71, info), \
+       INTEL_VGA_DEVICE(0x4E61, info), \
+       INTEL_VGA_DEVICE(0x4E51, info)
 
 /* TGL */
 #define INTEL_TGL_12_IDS(info) \