[SRU][OEM-OSP1-B][PATCH] UBUNTU: SAUCE: drm/i915: Add new CNL PCH ID seen on a CML platform

[Timo Aaltonen]

From: Imre Deak <imre.deak at intel.com>

BugLink: http://bugs.launchpad.net/bugs/1849278

On a CML platform a PCH with 0xA3C1 PCI ID, the driver doesn't detect
the PCH type correctly. We don't have the specification of the PCH PCI
ids, so let's assume this is a CNP PCH which has the closest PCI ID.

Signed-off-by: Imre Deak <imre.deak at intel.com>
Signed-off-by: Timo Aaltonen <timo.aaltonen at canonical.com>
---
 drivers/gpu/drm/i915/i915_drv.c | 1 +
 drivers/gpu/drm/i915/i915_drv.h | 1 +
 2 files changed, 2 insertions(+)

diff --git a/drivers/gpu/drm/i915/i915_drv.c b/drivers/gpu/drm/i915/i915_drv.c
index 0afbd77f5809..bfa878665a85 100644
--- a/drivers/gpu/drm/i915/i915_drv.c
+++ b/drivers/gpu/drm/i915/i915_drv.c
@@ -179,6 +179,7 @@ intel_pch_type(const struct drm_i915_private *dev_priv, unsigned short id)
 			!IS_COFFEELAKE(dev_priv));
 		return PCH_KBP;
 	case INTEL_PCH_CNP_DEVICE_ID_TYPE:
+	case INTEL_PCH_CNP2_DEVICE_ID_TYPE:
 		DRM_DEBUG_KMS("Found Cannon Lake PCH (CNP)\n");
 		WARN_ON(!IS_CANNONLAKE(dev_priv) && !IS_COFFEELAKE(dev_priv));
 		return PCH_CNP;
diff --git a/drivers/gpu/drm/i915/i915_drv.h b/drivers/gpu/drm/i915/i915_drv.h
index a854c64261fe..111209e186ab 100644
--- a/drivers/gpu/drm/i915/i915_drv.h
+++ b/drivers/gpu/drm/i915/i915_drv.h
@@ -2538,6 +2538,7 @@ static inline unsigned int i915_sg_segment_size(void)
 #define INTEL_PCH_SPT_LP_DEVICE_ID_TYPE		0x9D00
 #define INTEL_PCH_KBP_DEVICE_ID_TYPE		0xA280
 #define INTEL_PCH_CNP_DEVICE_ID_TYPE		0xA300
+#define INTEL_PCH_CNP2_DEVICE_ID_TYPE		0xA380
 #define INTEL_PCH_CNP_LP_DEVICE_ID_TYPE		0x9D80
 #define INTEL_PCH_CMP_DEVICE_ID_TYPE		0x0280
 #define INTEL_PCH_CMP2_DEVICE_ID_TYPE		0x0680
-- 
2.20.1