1 files changed, 13 insertions, 8 deletions

diff --git a/include/drm/i915_pciids.h b/include/drm/i915_pciids.h
index fd965ffbb92e..192667144693 100644
--- a/include/drm/i915_pciids.h
+++ b/include/drm/i915_pciids.h
@@ -365,16 +365,20 @@
         INTEL_VGA_DEVICE(0x593B, info) /* Halo GT4 */
 
 /* AML/KBL Y GT2 */
-#define INTEL_AML_GT2_IDS(info) \
+#define INTEL_AML_KBL_GT2_IDS(info) \
         INTEL_VGA_DEVICE(0x591C, info),  /* ULX GT2 */ \
         INTEL_VGA_DEVICE(0x87C0, info) /* ULX GT2 */
 
+/* AML/CFL Y GT2 */
+#define INTEL_AML_CFL_GT2_IDS(info) \
+        INTEL_VGA_DEVICE(0x87CA, info)
+
 #define INTEL_KBL_IDS(info) \
         INTEL_KBL_GT1_IDS(info), \
         INTEL_KBL_GT2_IDS(info), \
         INTEL_KBL_GT3_IDS(info), \
         INTEL_KBL_GT4_IDS(info), \
-        INTEL_AML_GT2_IDS(info)
+        INTEL_AML_KBL_GT2_IDS(info)
 
 /* CFL S */
 #define INTEL_CFL_S_GT1_IDS(info) \
@@ -407,17 +411,17 @@
 
 /* WHL/CFL U GT1 */
 #define INTEL_WHL_U_GT1_IDS(info) \
-        INTEL_VGA_DEVICE(0x3EA1, info)
+        INTEL_VGA_DEVICE(0x3EA1, info), \
+        INTEL_VGA_DEVICE(0x3EA4, info)
 
 /* WHL/CFL U GT2 */
 #define INTEL_WHL_U_GT2_IDS(info) \
-        INTEL_VGA_DEVICE(0x3EA0, info)
+        INTEL_VGA_DEVICE(0x3EA0, info), \
+        INTEL_VGA_DEVICE(0x3EA3, info)
 
 /* WHL/CFL U GT3 */
 #define INTEL_WHL_U_GT3_IDS(info) \
-        INTEL_VGA_DEVICE(0x3EA2, info), \
-        INTEL_VGA_DEVICE(0x3EA3, info), \
-        INTEL_VGA_DEVICE(0x3EA4, info)
+        INTEL_VGA_DEVICE(0x3EA2, info)
 
 #define INTEL_CFL_IDS(info)        \
         INTEL_CFL_S_GT1_IDS(info), \
@@ -427,7 +431,8 @@
         INTEL_CFL_U_GT3_IDS(info), \
         INTEL_WHL_U_GT1_IDS(info), \
         INTEL_WHL_U_GT2_IDS(info), \
-        INTEL_WHL_U_GT3_IDS(info)
+        INTEL_WHL_U_GT3_IDS(info), \
+        INTEL_AML_CFL_GT2_IDS(info)
 
 /* CNL */
 #define INTEL_CNL_IDS(info) \