mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-08-23 17:30:02 +00:00
drm/i915/dp: add 128b/132b support to link status checks
Abstract link status check to a function that takes 128b/132b and 8b/10b into account, and use it. Also dump link status on failures. Cc: Uma Shankar <uma.shankar@intel.com> Cc: Ville Syrjälä <ville.syrjala@linux.intel.com> Signed-off-by: Jani Nikula <jani.nikula@intel.com> Reviewed-by: Ville Syrjälä <ville.syrjala@linux.intel.com> Link: https://patchwork.freedesktop.org/patch/msgid/cec395d435679a290a1c35fcbfc54555101bfad1.1643878928.git.jani.nikula@intel.com
This commit is contained in:
parent
a421d8a992
commit
3ee7fab0f3
3 changed files with 34 additions and 11 deletions
|
@ -3628,6 +3628,32 @@ static void intel_dp_handle_test_request(struct intel_dp *intel_dp)
|
|||
"Could not write test response to sink\n");
|
||||
}
|
||||
|
||||
static bool intel_dp_link_ok(struct intel_dp *intel_dp,
|
||||
u8 link_status[DP_LINK_STATUS_SIZE])
|
||||
{
|
||||
struct intel_encoder *encoder = &dp_to_dig_port(intel_dp)->base;
|
||||
struct drm_i915_private *i915 = to_i915(encoder->base.dev);
|
||||
bool uhbr = intel_dp->link_rate >= 1000000;
|
||||
bool ok;
|
||||
|
||||
if (uhbr)
|
||||
ok = drm_dp_128b132b_lane_channel_eq_done(link_status,
|
||||
intel_dp->lane_count);
|
||||
else
|
||||
ok = drm_dp_channel_eq_ok(link_status, intel_dp->lane_count);
|
||||
|
||||
if (ok)
|
||||
return true;
|
||||
|
||||
intel_dp_dump_link_status(intel_dp, DP_PHY_DPRX, link_status);
|
||||
drm_dbg_kms(&i915->drm,
|
||||
"[ENCODER:%d:%s] %s link not ok, retraining\n",
|
||||
encoder->base.base.id, encoder->base.name,
|
||||
uhbr ? "128b/132b" : "8b/10b");
|
||||
|
||||
return false;
|
||||
}
|
||||
|
||||
static void
|
||||
intel_dp_mst_hpd_irq(struct intel_dp *intel_dp, u8 *esi, u8 *ack)
|
||||
{
|
||||
|
@ -3658,14 +3684,7 @@ static bool intel_dp_mst_link_status(struct intel_dp *intel_dp)
|
|||
return false;
|
||||
}
|
||||
|
||||
if (!drm_dp_channel_eq_ok(link_status, intel_dp->lane_count)) {
|
||||
drm_dbg_kms(&i915->drm,
|
||||
"[ENCODER:%d:%s] channel EQ not ok, retraining\n",
|
||||
encoder->base.base.id, encoder->base.name);
|
||||
return false;
|
||||
}
|
||||
|
||||
return true;
|
||||
return intel_dp_link_ok(intel_dp, link_status);
|
||||
}
|
||||
|
||||
/**
|
||||
|
@ -3779,8 +3798,8 @@ intel_dp_needs_link_retrain(struct intel_dp *intel_dp)
|
|||
intel_dp->lane_count))
|
||||
return false;
|
||||
|
||||
/* Retrain if Channel EQ or CR not ok */
|
||||
return !drm_dp_channel_eq_ok(link_status, intel_dp->lane_count);
|
||||
/* Retrain if link not ok */
|
||||
return !intel_dp_link_ok(intel_dp, link_status);
|
||||
}
|
||||
|
||||
static bool intel_dp_has_connector(struct intel_dp *intel_dp,
|
||||
|
|
|
@ -712,7 +712,7 @@ static bool intel_dp_adjust_request_changed(const struct intel_crtc_state *crtc_
|
|||
return false;
|
||||
}
|
||||
|
||||
static void
|
||||
void
|
||||
intel_dp_dump_link_status(struct intel_dp *intel_dp, enum drm_dp_phy dp_phy,
|
||||
const u8 link_status[DP_LINK_STATUS_SIZE])
|
||||
{
|
||||
|
|
|
@ -29,6 +29,10 @@ void intel_dp_start_link_train(struct intel_dp *intel_dp,
|
|||
void intel_dp_stop_link_train(struct intel_dp *intel_dp,
|
||||
const struct intel_crtc_state *crtc_state);
|
||||
|
||||
void
|
||||
intel_dp_dump_link_status(struct intel_dp *intel_dp, enum drm_dp_phy dp_phy,
|
||||
const u8 link_status[DP_LINK_STATUS_SIZE]);
|
||||
|
||||
/* Get the TPSx symbol type of the value programmed to DP_TRAINING_PATTERN_SET */
|
||||
static inline u8 intel_dp_training_pattern_symbol(u8 pattern)
|
||||
{
|
||||
|
|
Loading…
Reference in a new issue