Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

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

drm/i915: Kill PCH_KBP 



For us KBP is 100% identical to SPT. Kill the redundant enum
value. Also bspec doesn't talk about KBP either, so this might
avoid some confusion when cross checking the code against the
spec.

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


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

drivers/gpu/drm/i915/i915_drv.c

+2 −1
Original line number Diff line number Diff line
@@ -195,7 +195,8 @@ intel_pch_type(const struct drm_i915_private *dev_priv, unsigned short id) 
		DRM_DEBUG_KMS("Found Kaby Lake PCH (KBP)\n");

		WARN_ON(!IS_SKYLAKE(dev_priv) && !IS_KABYLAKE(dev_priv) &&

			!IS_COFFEELAKE(dev_priv));

		return PCH_KBP;

		/* KBP is SPT compatible */

		return PCH_SPT;

	case INTEL_PCH_CNP_DEVICE_ID_TYPE:

		DRM_DEBUG_KMS("Found Cannon Lake PCH (CNP)\n");

		WARN_ON(!IS_CANNONLAKE(dev_priv) && !IS_COFFEELAKE(dev_priv));

drivers/gpu/drm/i915/i915_drv.h

+1 −3
Original line number Diff line number Diff line
@@ -532,8 +532,7 @@ enum intel_pch { 
	PCH_IBX,	/* Ibexpeak PCH */

	PCH_CPT,	/* Cougarpoint/Pantherpoint PCH */

	PCH_LPT,	/* Lynxpoint/Wildcatpoint PCH */

	PCH_SPT,        /* Sunrisepoint PCH */

	PCH_KBP,        /* Kaby Lake PCH */

	PCH_SPT,        /* Sunrisepoint/Kaby Lake PCH */

	PCH_CNP,        /* Cannon/Comet Lake PCH */

	PCH_ICP,	/* Ice Lake PCH */

};
@@ -2629,7 +2628,6 @@ IS_SUBPLATFORM(const struct drm_i915_private *i915, 
#define INTEL_PCH_ID(dev_priv) ((dev_priv)->pch_id)

#define HAS_PCH_ICP(dev_priv) (INTEL_PCH_TYPE(dev_priv) == PCH_ICP)

#define HAS_PCH_CNP(dev_priv) (INTEL_PCH_TYPE(dev_priv) == PCH_CNP)

#define HAS_PCH_KBP(dev_priv) (INTEL_PCH_TYPE(dev_priv) == PCH_KBP)

#define HAS_PCH_SPT(dev_priv) (INTEL_PCH_TYPE(dev_priv) == PCH_SPT)

#define HAS_PCH_LPT(dev_priv) (INTEL_PCH_TYPE(dev_priv) == PCH_LPT)

#define HAS_PCH_LPT_LP(dev_priv) \

drivers/gpu/drm/i915/intel_gmbus.c

+2 −4
Original line number Diff line number Diff line
@@ -581,8 +581,7 @@ do_gmbus_xfer(struct i2c_adapter *adapter, struct i2c_msg *msgs, int num, 
	/* Display WA #0868: skl,bxt,kbl,cfl,glk,cnl */

	if (IS_GEN9_LP(dev_priv))

		bxt_gmbus_clock_gating(dev_priv, false);

	else if (HAS_PCH_SPT(dev_priv) ||

		 HAS_PCH_KBP(dev_priv) || HAS_PCH_CNP(dev_priv))

	else if (HAS_PCH_SPT(dev_priv) || HAS_PCH_CNP(dev_priv))

		pch_gmbus_clock_gating(dev_priv, false);



retry:
@@ -691,8 +690,7 @@ do_gmbus_xfer(struct i2c_adapter *adapter, struct i2c_msg *msgs, int num, 
	/* Display WA #0868: skl,bxt,kbl,cfl,glk,cnl */

	if (IS_GEN9_LP(dev_priv))

		bxt_gmbus_clock_gating(dev_priv, true);

	else if (HAS_PCH_SPT(dev_priv) ||

		 HAS_PCH_KBP(dev_priv) || HAS_PCH_CNP(dev_priv))

	else if (HAS_PCH_SPT(dev_priv) || HAS_PCH_CNP(dev_priv))

		pch_gmbus_clock_gating(dev_priv, true);



	return ret;