Commit cf9fb29c authored by Lucas De Marchi's avatar Lucas De Marchi
Browse files

drm/i915: remove explicit CNL handling from intel_pch.c 



Remove references for CNL from pch detection.

Signed-off-by: default avatarLucas De Marchi <lucas.demarchi@intel.com>
Reviewed-by: default avatarRodrigo Vivi <rodrigo.vivi@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20210728215946.1573015-19-lucas.demarchi@intel.com
parent dbac4f39

drivers/gpu/drm/i915/intel_pch.c

+1 −4
Original line number Diff line number Diff line
@@ -81,7 +81,6 @@ intel_pch_type(const struct drm_i915_private *dev_priv, unsigned short id) 
	case INTEL_PCH_CNP_DEVICE_ID_TYPE:

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

		drm_WARN_ON(&dev_priv->drm,

			    !IS_CANNONLAKE(dev_priv) &&

			    !IS_COFFEELAKE(dev_priv) &&

			    !IS_COMETLAKE(dev_priv));

		return PCH_CNP;
@@ -89,7 +88,6 @@ intel_pch_type(const struct drm_i915_private *dev_priv, unsigned short id) 
		drm_dbg_kms(&dev_priv->drm,

			    "Found Cannon Lake LP PCH (CNP-LP)\n");

		drm_WARN_ON(&dev_priv->drm,

			    !IS_CANNONLAKE(dev_priv) &&

			    !IS_COFFEELAKE(dev_priv) &&

			    !IS_COMETLAKE(dev_priv));

		return PCH_CNP;
@@ -171,8 +169,7 @@ intel_virt_detect_pch(const struct drm_i915_private *dev_priv, 
		id = INTEL_PCH_MCC_DEVICE_ID_TYPE;

	else if (IS_ICELAKE(dev_priv))

		id = INTEL_PCH_ICP_DEVICE_ID_TYPE;

	else if (IS_CANNONLAKE(dev_priv) ||

		 IS_COFFEELAKE(dev_priv) ||

	else if (IS_COFFEELAKE(dev_priv) ||

		 IS_COMETLAKE(dev_priv))

		id = INTEL_PCH_CNP_DEVICE_ID_TYPE;

	else if (IS_KABYLAKE(dev_priv) || IS_SKYLAKE(dev_priv))