Commit ca1dc50f authored by Ville Syrjälä's avatar Ville Syrjälä
Browse files

drm/i915: Use short PCH names consistently 



The comments regarding PCH compatibility use long vs.
short names inconsistently. Just use short names always.

Signed-off-by: default avatarVille Syrjälä <ville.syrjala@linux.intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20220630150600.24611-2-ville.syrjala@linux.intel.com


Reviewed-by: default avatarJani Nikula <jani.nikula@intel.com>
parent 3461b040

drivers/gpu/drm/i915/intel_pch.c

+5 −5
Original line number Original line Diff line number Diff line
@@ -25,7 +25,7 @@ intel_pch_type(const struct drm_i915_private *dev_priv, unsigned short id) 
		drm_dbg_kms(&dev_priv->drm, "Found PantherPoint PCH\n");

		drm_dbg_kms(&dev_priv->drm, "Found PantherPoint PCH\n");

		drm_WARN_ON(&dev_priv->drm,

		drm_WARN_ON(&dev_priv->drm,

			    GRAPHICS_VER(dev_priv) != 6 && !IS_IVYBRIDGE(dev_priv));

			    GRAPHICS_VER(dev_priv) != 6 && !IS_IVYBRIDGE(dev_priv));

		/* PantherPoint is CPT compatible */

		/* PPT is CPT compatible */

		return PCH_CPT;

		return PCH_CPT;

	case INTEL_PCH_LPT_DEVICE_ID_TYPE:

	case INTEL_PCH_LPT_DEVICE_ID_TYPE:

		drm_dbg_kms(&dev_priv->drm, "Found LynxPoint PCH\n");

		drm_dbg_kms(&dev_priv->drm, "Found LynxPoint PCH\n");
@@ -47,7 +47,7 @@ intel_pch_type(const struct drm_i915_private *dev_priv, unsigned short id) 
			    !IS_HASWELL(dev_priv) && !IS_BROADWELL(dev_priv));

			    !IS_HASWELL(dev_priv) && !IS_BROADWELL(dev_priv));

		drm_WARN_ON(&dev_priv->drm,

		drm_WARN_ON(&dev_priv->drm,

			    IS_HSW_ULT(dev_priv) || IS_BDW_ULT(dev_priv));

			    IS_HSW_ULT(dev_priv) || IS_BDW_ULT(dev_priv));

		/* WildcatPoint is LPT compatible */

		/* WPT is LPT compatible */

		return PCH_LPT;

		return PCH_LPT;

	case INTEL_PCH_WPT_LP_DEVICE_ID_TYPE:

	case INTEL_PCH_WPT_LP_DEVICE_ID_TYPE:

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

		drm_dbg_kms(&dev_priv->drm, "Found WildcatPoint LP PCH\n");
@@ -55,7 +55,7 @@ intel_pch_type(const struct drm_i915_private *dev_priv, unsigned short id) 
			    !IS_HASWELL(dev_priv) && !IS_BROADWELL(dev_priv));

			    !IS_HASWELL(dev_priv) && !IS_BROADWELL(dev_priv));

		drm_WARN_ON(&dev_priv->drm,

		drm_WARN_ON(&dev_priv->drm,

			    !IS_HSW_ULT(dev_priv) && !IS_BDW_ULT(dev_priv));

			    !IS_HSW_ULT(dev_priv) && !IS_BDW_ULT(dev_priv));

		/* WildcatPoint is LPT compatible */

		/* WPT is LPT compatible */

		return PCH_LPT;

		return PCH_LPT;

	case INTEL_PCH_SPT_DEVICE_ID_TYPE:

	case INTEL_PCH_SPT_DEVICE_ID_TYPE:

		drm_dbg_kms(&dev_priv->drm, "Found SunrisePoint PCH\n");

		drm_dbg_kms(&dev_priv->drm, "Found SunrisePoint PCH\n");
@@ -99,14 +99,14 @@ intel_pch_type(const struct drm_i915_private *dev_priv, unsigned short id) 
			    !IS_COFFEELAKE(dev_priv) &&

			    !IS_COFFEELAKE(dev_priv) &&

			    !IS_COMETLAKE(dev_priv) &&

			    !IS_COMETLAKE(dev_priv) &&

			    !IS_ROCKETLAKE(dev_priv));

			    !IS_ROCKETLAKE(dev_priv));

		/* CometPoint is CNP Compatible */

		/* CMP is CNP compatible */

		return PCH_CNP;

		return PCH_CNP;

	case INTEL_PCH_CMP_V_DEVICE_ID_TYPE:

	case INTEL_PCH_CMP_V_DEVICE_ID_TYPE:

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

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

		drm_WARN_ON(&dev_priv->drm,

		drm_WARN_ON(&dev_priv->drm,

			    !IS_COFFEELAKE(dev_priv) &&

			    !IS_COFFEELAKE(dev_priv) &&

			    !IS_COMETLAKE(dev_priv));

			    !IS_COMETLAKE(dev_priv));

		/* Comet Lake V PCH is based on KBP, which is SPT compatible */

		/* CMP-V is based on KBP, which is SPT compatible */

		return PCH_SPT;

		return PCH_SPT;

	case INTEL_PCH_ICP_DEVICE_ID_TYPE:

	case INTEL_PCH_ICP_DEVICE_ID_TYPE:

	case INTEL_PCH_ICP2_DEVICE_ID_TYPE:

	case INTEL_PCH_ICP2_DEVICE_ID_TYPE: