Commit a8064d57 authored Sep 16, 2019 by Matt Roper Committed by Rodrigo Vivi Oct 09, 2019

drm/i915/cml: Add second PCH ID for CMP

The CMP PCH ID we have in the driver is correct for the CML-U machines we have
in our CI system, but the CML-S and CML-H CI machines appear to use a
different PCH ID, leading our driver to detect no PCH for them.

Cc: Rodrigo Vivi <rodrigo.vivi@intel.com>
Cc: Anusha Srivatsa <anusha.srivatsa@intel.com>
References: 729ae330 ("drm/i915/cml: Introduce Comet Lake PCH")
Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=111461


Signed-off-by: Matt Roper <matthew.d.roper@intel.com>
Acked-by: Chris Wilson <chris@chris-wilson.co.uk>
Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
Link: https://patchwork.freedesktop.org/patch/msgid/20190916233251.387-1-matthew.d.roper@intel.com


Fixes: 729ae330 ("drm/i915/cml: Introduce Comet Lake PCH")
(cherry picked from commit 8698ba53)
Signed-off-by: Rodrigo Vivi <rodrigo.vivi@intel.com>

parent b925708f

drivers/gpu/drm/i915/intel_pch.c

+1 −0

Original line number	Diff line number	Diff line
		@@ -69,6 +69,7 @@ intel_pch_type(const struct drm_i915_private *dev_priv, unsigned short id)
		WARN_ON(!IS_CANNONLAKE(dev_priv) && !IS_COFFEELAKE(dev_priv));
		return PCH_CNP;
		case INTEL_PCH_CMP_DEVICE_ID_TYPE:
		case INTEL_PCH_CMP2_DEVICE_ID_TYPE:
		DRM_DEBUG_KMS("Found Comet Lake PCH (CMP)\n");
		WARN_ON(!IS_COFFEELAKE(dev_priv));
		/* CometPoint is CNP Compatible */

drivers/gpu/drm/i915/intel_pch.h

+1 −0

Original line number	Diff line number	Diff line
		@@ -41,6 +41,7 @@ enum intel_pch {
		#define INTEL_PCH_CNP_DEVICE_ID_TYPE 0xA300
		#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
		#define INTEL_PCH_ICP_DEVICE_ID_TYPE 0x3480
		#define INTEL_PCH_MCC_DEVICE_ID_TYPE 0x4B00
		#define INTEL_PCH_MCC2_DEVICE_ID_TYPE 0x3880

Admin message