Commit a09e89e9 authored by Matt Roper's avatar Matt Roper Committed by Lucas De Marchi
Browse files

drm/i915/rkl: Add PCH support 



Rocket Lake can pair with either TGP or CMP.

Cc: Lucas De Marchi <lucas.demarchi@intel.com>
Signed-off-by: default avatarMatt Roper <matthew.d.roper@intel.com>
Reviewed-by: default avatarLucas De Marchi <lucas.demarchi@intel.com>
Signed-off-by: default avatarLucas De Marchi <lucas.demarchi@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20200504225227.464666-6-matthew.d.roper@intel.com
parent 3a303a35

drivers/gpu/drm/i915/intel_pch.c

+5 −3
Original line number Diff line number Diff line
@@ -88,7 +88,8 @@ intel_pch_type(const struct drm_i915_private *dev_priv, unsigned short id) 
	case INTEL_PCH_CMP_DEVICE_ID_TYPE:

	case INTEL_PCH_CMP2_DEVICE_ID_TYPE:

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

		drm_WARN_ON(&dev_priv->drm, !IS_COFFEELAKE(dev_priv));

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

			    !IS_ROCKETLAKE(dev_priv));

		/* CometPoint is CNP Compatible */

		return PCH_CNP;

	case INTEL_PCH_CMP_V_DEVICE_ID_TYPE:
@@ -107,7 +108,8 @@ intel_pch_type(const struct drm_i915_private *dev_priv, unsigned short id) 
	case INTEL_PCH_TGP_DEVICE_ID_TYPE:

	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));

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

			    !IS_ROCKETLAKE(dev_priv));

		return PCH_TGP;

	case INTEL_PCH_JSP_DEVICE_ID_TYPE:

	case INTEL_PCH_JSP2_DEVICE_ID_TYPE:
@@ -141,7 +143,7 @@ intel_virt_detect_pch(const struct drm_i915_private *dev_priv) 
	 * make an educated guess as to which PCH is really there.

	 */



	if (IS_TIGERLAKE(dev_priv))

	if (IS_TIGERLAKE(dev_priv) || IS_ROCKETLAKE(dev_priv))

		id = INTEL_PCH_TGP_DEVICE_ID_TYPE;

	else if (IS_ELKHARTLAKE(dev_priv))

		id = INTEL_PCH_MCC_DEVICE_ID_TYPE;

CRA Git | Maintained and supported by SUSTech CRA and CCSE