3 files changed, 11 insertions, 14 deletions

diff --git a/drivers/gpu/drm/i915/i915_drv.h b/drivers/gpu/drm/i915/i915_drv.h
index 88255f9c3cc4..8b5c1a839655 100644
--- a/drivers/gpu/drm/i915/i915_drv.h
+++ b/drivers/gpu/drm/i915/i915_drv.h
@@ -2648,6 +2648,8 @@ intel_info(const struct drm_i915_private *dev_priv)
                                  (dev_priv)->info.gt == 2)
 #define IS_CFL_GT3(dev_priv)    (IS_COFFEELAKE(dev_priv) && \
                                  (dev_priv)->info.gt == 3)
+#define IS_CNL_WITH_PORT_F(dev_priv)   (IS_CANNONLAKE(dev_priv) && \
+                                        (INTEL_DEVID(dev_priv) & 0x0004) == 0x0004)
 
 #define IS_ALPHA_SUPPORT(intel_info) ((intel_info)->is_alpha_support)
 
diff --git a/drivers/gpu/drm/i915/i915_pci.c b/drivers/gpu/drm/i915/i915_pci.c
index 138228dd7782..4e7a10c89782 100644
--- a/drivers/gpu/drm/i915/i915_pci.c
+++ b/drivers/gpu/drm/i915/i915_pci.c
@@ -571,7 +571,7 @@ static const struct intel_device_info intel_coffeelake_gt3_info = {
         .ddb_size = 1024, \
         GLK_COLORS
 
-static const struct intel_device_info intel_cannonlake_gt2_info = {
+static const struct intel_device_info intel_cannonlake_info = {
         GEN10_FEATURES,
         .is_alpha_support = 1,
         .platform = INTEL_CANNONLAKE,
@@ -649,8 +649,7 @@ static const struct pci_device_id pciidlist[] = {
         INTEL_CFL_U_GT1_IDS(&intel_coffeelake_gt1_info),
         INTEL_CFL_U_GT2_IDS(&intel_coffeelake_gt2_info),
         INTEL_CFL_U_GT3_IDS(&intel_coffeelake_gt3_info),
-        INTEL_CNL_U_GT2_IDS(&intel_cannonlake_gt2_info),
-        INTEL_CNL_Y_GT2_IDS(&intel_cannonlake_gt2_info),
+        INTEL_CNL_IDS(&intel_cannonlake_info),
         {0, 0, 0}
 };
 MODULE_DEVICE_TABLE(pci, pciidlist);
diff --git a/include/drm/i915_pciids.h b/include/drm/i915_pciids.h
index 5db0458dd832..9e1fe6634424 100644
--- a/include/drm/i915_pciids.h
+++ b/include/drm/i915_pciids.h
@@ -414,24 +414,20 @@
         INTEL_CFL_U_GT2_IDS(info), \
         INTEL_CFL_U_GT3_IDS(info)
 
-/* CNL U 2+2 */
-#define INTEL_CNL_U_GT2_IDS(info) \
+/* CNL */
+#define INTEL_CNL_IDS(info) \
         INTEL_VGA_DEVICE(0x5A52, info), \
         INTEL_VGA_DEVICE(0x5A5A, info), \
         INTEL_VGA_DEVICE(0x5A42, info), \
-        INTEL_VGA_DEVICE(0x5A4A, info)
-
-/* CNL Y 2+2 */
-#define INTEL_CNL_Y_GT2_IDS(info) \
+        INTEL_VGA_DEVICE(0x5A4A, info), \
         INTEL_VGA_DEVICE(0x5A51, info), \
         INTEL_VGA_DEVICE(0x5A59, info), \
         INTEL_VGA_DEVICE(0x5A41, info), \
         INTEL_VGA_DEVICE(0x5A49, info), \
         INTEL_VGA_DEVICE(0x5A71, info), \
-        INTEL_VGA_DEVICE(0x5A79, info)
-
-#define INTEL_CNL_IDS(info) \
-        INTEL_CNL_U_GT2_IDS(info), \
-        INTEL_CNL_Y_GT2_IDS(info)
+        INTEL_VGA_DEVICE(0x5A79, info), \
+        INTEL_VGA_DEVICE(0x5A54, info), \
+        INTEL_VGA_DEVICE(0x5A5C, info), \
+        INTEL_VGA_DEVICE(0x5A44, info)
 
 #endif /* _I915_PCIIDS_H */