From: Imre Deak Date: Wed, 13 Nov 2019 11:14:18 +0000 (+0800) Subject: drm/i915: Add new CNL PCH ID seen on a CML platform X-Git-Tag: Ubuntu-5.3.0-25.27~16 X-Git-Url: https://git.proxmox.com/?a=commitdiff_plain;h=674278766301a851c9174c0eb2b430f92ba2a2a8;p=mirror_ubuntu-eoan-kernel.git drm/i915: Add new CNL PCH ID seen on a CML platform BugLink: https://bugs.launchpad.net/bugs/1852386 Atm we don't detect a PCH with PCI ID 0xA3C1 which showed up now on a CML platform. We don't have the official assignment of the PCH PCI IDs, but this looks like a CNP which was already used on CML platforms. Let's add the new ID->PCH type mapping accordingly. Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=112051 Reported-and-tested-by: Cyrus Cc: Cyrus Signed-off-by: Imre Deak Reviewed-by: José Roberto de Souza Link: https://patchwork.freedesktop.org/patch/msgid/20191022095155.30991-1-imre.deak@intel.com (backported from commit 37c92dc303dd0977134d1c8501f057de407473ec https://anongit.freedesktop.org/git/drm-tip.git) Signed-off-by: You-Sheng Yang Acked-by: Andrea Righi Acked-by: Stefan Bader Signed-off-by: Khalid Elmously --- diff --git a/drivers/gpu/drm/i915/i915_drv.c b/drivers/gpu/drm/i915/i915_drv.c index abb04354197a..8dac06601ec5 100644 --- a/drivers/gpu/drm/i915/i915_drv.c +++ b/drivers/gpu/drm/i915/i915_drv.c @@ -202,6 +202,7 @@ intel_pch_type(const struct drm_i915_private *dev_priv, unsigned short id) /* KBP is SPT compatible */ return PCH_SPT; 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 e7b7c5159378..ac25b41ac4b5 100644 --- a/drivers/gpu/drm/i915/i915_drv.h +++ b/drivers/gpu/drm/i915/i915_drv.h @@ -2373,6 +2373,7 @@ IS_SUBPLATFORM(const struct drm_i915_private *i915, #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