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

drm/i915: Show LTTPR in the TPS debug print 



Indicate which LTTPR we're currently attempting to train when
we print which training pattern we're using.

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


Reviewed-by: default avatarImre Deak <imre.deak@intel.com>
parent 8bc2f5c3

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

+1 −1
Original line number Diff line number Diff line
@@ -637,7 +637,7 @@ static void intel_dp_enable_port(struct intel_dp *intel_dp, 
	/* enable with pattern 1 (as per spec) */



	intel_dp_program_link_training_pattern(intel_dp, crtc_state,

					       DP_TRAINING_PATTERN_1);

					       DP_PHY_DPRX, DP_TRAINING_PATTERN_1);



	/*

	 * Magic for VLV/CHV. We _must_ first set up the register

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

+7 −4
Original line number Diff line number Diff line
@@ -376,7 +376,7 @@ intel_dp_set_link_train(struct intel_dp *intel_dp, 
	int len;



	intel_dp_program_link_training_pattern(intel_dp, crtc_state,

					       dp_train_pat);

					       dp_phy, dp_train_pat);



	buf[0] = dp_train_pat;

	/* DP_TRAINING_LANEx_SET follow DP_TRAINING_PATTERN_SET */
@@ -404,17 +404,20 @@ static char dp_training_pattern_name(u8 train_pat) 
void

intel_dp_program_link_training_pattern(struct intel_dp *intel_dp,

				       const struct intel_crtc_state *crtc_state,

				       enum drm_dp_phy dp_phy,

				       u8 dp_train_pat)

{

	struct intel_encoder *encoder = &dp_to_dig_port(intel_dp)->base;

	struct drm_i915_private *dev_priv = to_i915(encoder->base.dev);

	u8 train_pat = intel_dp_training_pattern_symbol(dp_train_pat);

	char phy_name[10];



	if (train_pat != DP_TRAINING_PATTERN_DISABLE)

		drm_dbg_kms(&dev_priv->drm,

			    "[ENCODER:%d:%s] Using DP training pattern TPS%c\n",

			    "[ENCODER:%d:%s] Using DP training pattern TPS%c, at %s\n",

			    encoder->base.base.id, encoder->base.name,

			    dp_training_pattern_name(train_pat));

			    dp_training_pattern_name(train_pat),

			    intel_dp_phy_name(dp_phy, phy_name, sizeof(phy_name)));



	intel_dp->set_link_train(intel_dp, crtc_state, dp_train_pat);

}
@@ -855,7 +858,7 @@ void intel_dp_stop_link_train(struct intel_dp *intel_dp, 
	intel_dp->link_trained = true;



	intel_dp_disable_dpcd_training_pattern(intel_dp, DP_PHY_DPRX);

	intel_dp_program_link_training_pattern(intel_dp, crtc_state,

	intel_dp_program_link_training_pattern(intel_dp, crtc_state, DP_PHY_DPRX,

					       DP_TRAINING_PATTERN_DISABLE);

}

drivers/gpu/drm/i915/display/intel_dp_link_training.h

+1 −0
Original line number Diff line number Diff line
@@ -19,6 +19,7 @@ void intel_dp_get_adjust_train(struct intel_dp *intel_dp, 
			       const u8 link_status[DP_LINK_STATUS_SIZE]);

void intel_dp_program_link_training_pattern(struct intel_dp *intel_dp,

					    const struct intel_crtc_state *crtc_state,

					    enum drm_dp_phy dp_phy,

					    u8 dp_train_pat);

void intel_dp_set_signal_levels(struct intel_dp *intel_dp,

				const struct intel_crtc_state *crtc_state,