Commit 4b97039e authored by Lyude Paul's avatar Lyude Paul
Browse files

drm/i915/gen9_bc: Recognize TGP PCH + CML combos 



Since Intel has introduced the gen9_bc platform, a combination of
Tigerpoint PCHs and CML CPUs, let's recognize such platforms as valid and
avoid WARNing on them.

Changes since v4:
* Split this into it's own patch - vsyrjala

Cc: Matt Roper <matthew.d.roper@intel.com>
Cc: Jani Nikula <jani.nikula@linux.intel.com>
Cc: Ville Syrjala <ville.syrjala@linux.intel.com>
[originally from Tejas's work]
Signed-off-by: default avatarTejas Upadhyay <tejaskumarx.surendrakumar.upadhyay@intel.com>
Signed-off-by: default avatarLyude Paul <lyude@redhat.com>
Reviewed-by: default avatarRodrigo Vivi <rodrigo.vivi@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20210209212832.1401815-2-lyude@redhat.com
parent aaab24bb

drivers/gpu/drm/i915/intel_pch.c

+2 −1
Original line number Diff line number Diff line
@@ -121,7 +121,8 @@ intel_pch_type(const struct drm_i915_private *dev_priv, unsigned short id) 
	case INTEL_PCH_TGP2_DEVICE_ID_TYPE:

		drm_dbg_kms(&dev_priv->drm, "Found Tiger Lake LP PCH\n");

		drm_WARN_ON(&dev_priv->drm, !IS_TIGERLAKE(dev_priv) &&

			    !IS_ROCKETLAKE(dev_priv));

			    !IS_ROCKETLAKE(dev_priv) &&

			    !IS_GEN9_BC(dev_priv));

		return PCH_TGP;

	case INTEL_PCH_JSP_DEVICE_ID_TYPE:

	case INTEL_PCH_JSP2_DEVICE_ID_TYPE: