Commit b4cd8dd3 authored by Matt Roper's avatar Matt Roper Committed by José Roberto de Souza
Browse files

drm/i915/adl_s: Update PHY_MISC programming 



ADL-S switches up which PHYs are considered a master to other PHYs;
PHY-C is no longer a master, but PHY-D is now.

Bspec: 49291
Cc: Jani Nikula <jani.nikula@intel.com>
Cc: Ville Syrjälä <ville.syrjala@linux.intel.com>
Cc: Imre Deak <imre.deak@intel.com>
Cc: Lucas De Marchi <lucas.demarchi@intel.com>
Signed-off-by: default avatarMatt Roper <matthew.d.roper@intel.com>
Signed-off-by: default avatarAditya Swarup <aditya.swarup@intel.com>
Reviewed-by: default avatarAditya Swarup <aditya.swarup@intel.com>
Signed-off-by: default avatarJosé Roberto de Souza <jose.souza@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20210129182945.217078-2-aditya.swarup@intel.com
parent 52401eb8

drivers/gpu/drm/i915/display/intel_combo_phy.c

+9 −3
Original line number Diff line number Diff line
@@ -187,8 +187,14 @@ static bool has_phy_misc(struct drm_i915_private *i915, enum phy phy) 
	 * Some platforms only expect PHY_MISC to be programmed for PHY-A and

	 * PHY-B and may not even have instances of the register for the

	 * other combo PHY's.

	 *

	 * ADL-S technically has three instances of PHY_MISC, but only requires

	 * that we program it for PHY A.

	 */

	if (IS_JSL_EHL(i915) ||



	if (IS_ALDERLAKE_S(i915))

		return phy == PHY_A;

	else if (IS_JSL_EHL(i915) ||

		 IS_ROCKETLAKE(i915) ||

		 IS_DG1(i915))

		return phy < PHY_C;