niansa-misc/linux
1
0
Fork 0
mirror of synced 2025-03-06 20:59:54 +01:00
Code Issues Projects Releases Packages Wiki Activity

drm/i915/dp: Add link training debug and error printing helpers

Browse source 
Add functions for printing link training debug and error messages, both
to prepare for the next patch, which downgrades an error to a debug
message if the sink is disconnected and to remove some code duplication.

v2: (Ville)
- Always print the connector prefix.
- Preserve the drm_dbg_kms() debug category.
v3:
- Keep printing the name of functions calling the helpers. (Jani)

Cc: Ville Syrjälä <ville.syrjala@linux.intel.com>
Cc: Jani Nikula <jani.nikula@intel.com>
Reviewed-by: Ville Syrjälä <ville.syrjala@linux.intel.com> (v2)
Signed-off-by: Imre Deak <imre.deak@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20230510103131.1618266-9-imre.deak@intel.com
This commit is contained in:
Imre Deak 2023-05-10 13:31:25 +03:00
parent e826839e18
commit f48eab2902
1 changed files with 120 additions and 247 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

367
drivers/gpu/drm/i915/display/intel_dp_link_training.c
View file

@ -26,6 +26,23 @@
#include "intel_dp.h" #include "intel_dp.h"
#include "intel_dp_link_training.h" #include "intel_dp_link_training.h"
#define LT_MSG_PREFIX "[CONNECTOR:%d:%s][ENCODER:%d:%s][%s] "
#define LT_MSG_ARGS(_intel_dp, _dp_phy) (_intel_dp)->attached_connector->base.base.id, \
(_intel_dp)->attached_connector->base.name, \
dp_to_dig_port(_intel_dp)->base.base.base.id, \
dp_to_dig_port(_intel_dp)->base.base.name, \
drm_dp_phy_name(_dp_phy)
#define lt_dbg(_intel_dp, _dp_phy, _format, ...) \
drm_dbg_kms(&dp_to_i915(_intel_dp)->drm, \
LT_MSG_PREFIX _format, \
LT_MSG_ARGS(_intel_dp, _dp_phy), ## __VA_ARGS__)
#define lt_err(_intel_dp, _dp_phy, _format, ...) \
drm_err(&dp_to_i915(_intel_dp)->drm, \
LT_MSG_PREFIX _format, \
LT_MSG_ARGS(_intel_dp, _dp_phy), ## __VA_ARGS__)
static void intel_dp_reset_lttpr_common_caps(struct intel_dp *intel_dp) static void intel_dp_reset_lttpr_common_caps(struct intel_dp *intel_dp)
{ {
memset(intel_dp->lttpr_common_caps, 0, sizeof(intel_dp->lttpr_common_caps)); memset(intel_dp->lttpr_common_caps, 0, sizeof(intel_dp->lttpr_common_caps));
@ -47,29 +64,21 @@ static void intel_dp_read_lttpr_phy_caps(struct intel_dp *intel_dp,
const u8 dpcd[DP_RECEIVER_CAP_SIZE], const u8 dpcd[DP_RECEIVER_CAP_SIZE],
enum drm_dp_phy dp_phy) enum drm_dp_phy dp_phy)
{ {
struct intel_encoder *encoder = &dp_to_dig_port(intel_dp)->base;
u8 *phy_caps = intel_dp_lttpr_phy_caps(intel_dp, dp_phy); u8 *phy_caps = intel_dp_lttpr_phy_caps(intel_dp, dp_phy);
if (drm_dp_read_lttpr_phy_caps(&intel_dp->aux, dpcd, dp_phy, phy_caps) < 0) { if (drm_dp_read_lttpr_phy_caps(&intel_dp->aux, dpcd, dp_phy, phy_caps) < 0) {
drm_dbg_kms(&dp_to_i915(intel_dp)->drm, lt_dbg(intel_dp, dp_phy, "failed to read the PHY caps\n");
"[ENCODER:%d:%s][%s] failed to read the PHY caps\n",
encoder->base.base.id, encoder->base.name,
drm_dp_phy_name(dp_phy));
return; return;
} }
drm_dbg_kms(&dp_to_i915(intel_dp)->drm, lt_dbg(intel_dp, dp_phy, "PHY capabilities: %*ph\n",
"[ENCODER:%d:%s][%s] PHY capabilities: %*ph\n", (int)sizeof(intel_dp->lttpr_phy_caps[0]),
encoder->base.base.id, encoder->base.name, phy_caps);
drm_dp_phy_name(dp_phy),
(int)sizeof(intel_dp->lttpr_phy_caps[0]),
phy_caps);
} }
static bool intel_dp_read_lttpr_common_caps(struct intel_dp *intel_dp, static bool intel_dp_read_lttpr_common_caps(struct intel_dp *intel_dp,
const u8 dpcd[DP_RECEIVER_CAP_SIZE]) const u8 dpcd[DP_RECEIVER_CAP_SIZE])
{ {
struct intel_encoder *encoder = &dp_to_dig_port(intel_dp)->base;
int ret; int ret;
ret = drm_dp_read_lttpr_common_caps(&intel_dp->aux, dpcd, ret = drm_dp_read_lttpr_common_caps(&intel_dp->aux, dpcd,
@ -77,11 +86,9 @@ static bool intel_dp_read_lttpr_common_caps(struct intel_dp *intel_dp,
if (ret < 0) if (ret < 0)
goto reset_caps; goto reset_caps;
drm_dbg_kms(&dp_to_i915(intel_dp)->drm, lt_dbg(intel_dp, DP_PHY_DPRX, "LTTPR common capabilities: %*ph\n",
"[ENCODER:%d:%s] LTTPR common capabilities: %*ph\n", (int)sizeof(intel_dp->lttpr_common_caps),
encoder->base.base.id, encoder->base.name, intel_dp->lttpr_common_caps);
(int)sizeof(intel_dp->lttpr_common_caps),
intel_dp->lttpr_common_caps);
/* The minimum value of LT_TUNABLE_PHY_REPEATER_FIELD_DATA_STRUCTURE_REV is 1.4 */ /* The minimum value of LT_TUNABLE_PHY_REPEATER_FIELD_DATA_STRUCTURE_REV is 1.4 */
if (intel_dp->lttpr_common_caps[0] < 0x14) if (intel_dp->lttpr_common_caps[0] < 0x14)
@ -105,8 +112,6 @@ intel_dp_set_lttpr_transparent_mode(struct intel_dp *intel_dp, bool enable)
static int intel_dp_init_lttpr(struct intel_dp *intel_dp, const u8 dpcd[DP_RECEIVER_CAP_SIZE]) static int intel_dp_init_lttpr(struct intel_dp *intel_dp, const u8 dpcd[DP_RECEIVER_CAP_SIZE])
{ {
struct intel_encoder *encoder = &dp_to_dig_port(intel_dp)->base;
struct drm_i915_private *i915 = to_i915(encoder->base.dev);
int lttpr_count; int lttpr_count;
int i; int i;
@ -138,9 +143,8 @@ static int intel_dp_init_lttpr(struct intel_dp *intel_dp, const u8 dpcd[DP_RECEI
return 0; return 0;
if (!intel_dp_set_lttpr_transparent_mode(intel_dp, false)) { if (!intel_dp_set_lttpr_transparent_mode(intel_dp, false)) {
drm_dbg_kms(&i915->drm, lt_dbg(intel_dp, DP_PHY_DPRX,
"[ENCODER:%d:%s] Switching to LTTPR non-transparent LT mode failed, fall-back to transparent mode\n", "Switching to LTTPR non-transparent LT mode failed, fall-back to transparent mode\n");
encoder->base.base.id, encoder->base.name);
intel_dp_set_lttpr_transparent_mode(intel_dp, true); intel_dp_set_lttpr_transparent_mode(intel_dp, true);
intel_dp_reset_lttpr_count(intel_dp); intel_dp_reset_lttpr_count(intel_dp);
@ -409,26 +413,22 @@ intel_dp_get_adjust_train(struct intel_dp *intel_dp,
enum drm_dp_phy dp_phy, enum drm_dp_phy dp_phy,
const u8 link_status[DP_LINK_STATUS_SIZE]) const 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);
int lane; int lane;
if (intel_dp_is_uhbr(crtc_state)) { if (intel_dp_is_uhbr(crtc_state)) {
drm_dbg_kms(&i915->drm, "[ENCODER:%d:%s][%s] 128b/132b, lanes: %d, " lt_dbg(intel_dp, dp_phy,
"TX FFE request: " TRAIN_REQ_FMT "\n", "128b/132b, lanes: %d, "
encoder->base.base.id, encoder->base.name, "TX FFE request: " TRAIN_REQ_FMT "\n",
drm_dp_phy_name(dp_phy), crtc_state->lane_count,
crtc_state->lane_count, TRAIN_REQ_TX_FFE_ARGS(link_status));
TRAIN_REQ_TX_FFE_ARGS(link_status));
} else { } else {
drm_dbg_kms(&i915->drm, "[ENCODER:%d:%s][%s] 8b/10b, lanes: %d, " lt_dbg(intel_dp, dp_phy,
"vswing request: " TRAIN_REQ_FMT ", " "8b/10b, lanes: %d, "
"pre-emphasis request: " TRAIN_REQ_FMT "\n", "vswing request: " TRAIN_REQ_FMT ", "
encoder->base.base.id, encoder->base.name, "pre-emphasis request: " TRAIN_REQ_FMT "\n",
drm_dp_phy_name(dp_phy), crtc_state->lane_count,
crtc_state->lane_count, TRAIN_REQ_VSWING_ARGS(link_status),
TRAIN_REQ_VSWING_ARGS(link_status), TRAIN_REQ_PREEMPH_ARGS(link_status));
TRAIN_REQ_PREEMPH_ARGS(link_status));
} }
for (lane = 0; lane < 4; lane++) for (lane = 0; lane < 4; lane++)
@ -487,16 +487,11 @@ intel_dp_program_link_training_pattern(struct intel_dp *intel_dp,
enum drm_dp_phy dp_phy, enum drm_dp_phy dp_phy,
u8 dp_train_pat) u8 dp_train_pat)
{ {
struct intel_encoder *encoder = &dp_to_dig_port(intel_dp)->base;
struct drm_i915_private *i915 = to_i915(encoder->base.dev);
u8 train_pat = intel_dp_training_pattern_symbol(dp_train_pat); u8 train_pat = intel_dp_training_pattern_symbol(dp_train_pat);
if (train_pat != DP_TRAINING_PATTERN_DISABLE) if (train_pat != DP_TRAINING_PATTERN_DISABLE)
drm_dbg_kms(&i915->drm, lt_dbg(intel_dp, dp_phy, "Using DP training pattern TPS%c\n",
"[ENCODER:%d:%s][%s] Using DP training pattern TPS%c\n", dp_training_pattern_name(train_pat));
encoder->base.base.id, encoder->base.name,
drm_dp_phy_name(dp_phy),
dp_training_pattern_name(train_pat));
intel_dp->set_link_train(intel_dp, crtc_state, dp_train_pat); intel_dp->set_link_train(intel_dp, crtc_state, dp_train_pat);
} }
@ -531,24 +526,21 @@ void intel_dp_set_signal_levels(struct intel_dp *intel_dp,
enum drm_dp_phy dp_phy) enum drm_dp_phy dp_phy)
{ {
struct intel_encoder *encoder = &dp_to_dig_port(intel_dp)->base; struct intel_encoder *encoder = &dp_to_dig_port(intel_dp)->base;
struct drm_i915_private *i915 = to_i915(encoder->base.dev);
if (intel_dp_is_uhbr(crtc_state)) { if (intel_dp_is_uhbr(crtc_state)) {
drm_dbg_kms(&i915->drm, "[ENCODER:%d:%s][%s] 128b/132b, lanes: %d, " lt_dbg(intel_dp, dp_phy,
"TX FFE presets: " TRAIN_SET_FMT "\n", "128b/132b, lanes: %d, "
encoder->base.base.id, encoder->base.name, "TX FFE presets: " TRAIN_SET_FMT "\n",
drm_dp_phy_name(dp_phy), crtc_state->lane_count,
crtc_state->lane_count, TRAIN_SET_TX_FFE_ARGS(intel_dp->train_set));
TRAIN_SET_TX_FFE_ARGS(intel_dp->train_set));
} else { } else {
drm_dbg_kms(&i915->drm, "[ENCODER:%d:%s][%s] 8b/10b, lanes: %d, " lt_dbg(intel_dp, dp_phy,
"vswing levels: " TRAIN_SET_FMT ", " "8b/10b, lanes: %d, "
"pre-emphasis levels: " TRAIN_SET_FMT "\n", "vswing levels: " TRAIN_SET_FMT ", "
encoder->base.base.id, encoder->base.name, "pre-emphasis levels: " TRAIN_SET_FMT "\n",
drm_dp_phy_name(dp_phy), crtc_state->lane_count,
crtc_state->lane_count, TRAIN_SET_VSWING_ARGS(intel_dp->train_set),
TRAIN_SET_VSWING_ARGS(intel_dp->train_set), TRAIN_SET_PREEMPH_ARGS(intel_dp->train_set));
TRAIN_SET_PREEMPH_ARGS(intel_dp->train_set));
} }
if (intel_dp_phy_is_downstream_of_source(intel_dp, dp_phy)) if (intel_dp_phy_is_downstream_of_source(intel_dp, dp_phy))
@ -677,8 +669,6 @@ static bool
intel_dp_prepare_link_train(struct intel_dp *intel_dp, intel_dp_prepare_link_train(struct intel_dp *intel_dp,
const struct intel_crtc_state *crtc_state) const struct intel_crtc_state *crtc_state)
{ {
struct intel_encoder *encoder = &dp_to_dig_port(intel_dp)->base;
struct drm_i915_private *i915 = to_i915(encoder->base.dev);
u8 link_bw, rate_select; u8 link_bw, rate_select;
if (intel_dp->prepare_link_retrain) if (intel_dp->prepare_link_retrain)
@ -699,24 +689,21 @@ intel_dp_prepare_link_train(struct intel_dp *intel_dp,
* link rates are not stable. * link rates are not stable.
*/ */
if (!link_bw) { if (!link_bw) {
struct intel_connector *connector = intel_dp->attached_connector;
__le16 sink_rates[DP_MAX_SUPPORTED_RATES]; __le16 sink_rates[DP_MAX_SUPPORTED_RATES];
drm_dbg_kms(&i915->drm, "[CONNECTOR:%d:%s] Reloading eDP link rates\n", lt_dbg(intel_dp, DP_PHY_DPRX, "Reloading eDP link rates\n");
connector->base.base.id, connector->base.name);
drm_dp_dpcd_read(&intel_dp->aux, DP_SUPPORTED_LINK_RATES, drm_dp_dpcd_read(&intel_dp->aux, DP_SUPPORTED_LINK_RATES,
sink_rates, sizeof(sink_rates)); sink_rates, sizeof(sink_rates));
} }
if (link_bw) if (link_bw)
drm_dbg_kms(&i915->drm, lt_dbg(intel_dp, DP_PHY_DPRX, "Using LINK_BW_SET value %02x\n",
"[ENCODER:%d:%s] Using LINK_BW_SET value %02x\n", link_bw);
encoder->base.base.id, encoder->base.name, link_bw);
else else
drm_dbg_kms(&i915->drm, lt_dbg(intel_dp, DP_PHY_DPRX,
"[ENCODER:%d:%s] Using LINK_RATE_SET value %02x\n", "Using LINK_RATE_SET value %02x\n",
encoder->base.base.id, encoder->base.name, rate_select); rate_select);
/* /*
* Spec DP2.1 Section 3.5.2.16 * Spec DP2.1 Section 3.5.2.16
* Prior to LT DPTX should set 128b/132b DP Channel coding and then set link rate * Prior to LT DPTX should set 128b/132b DP Channel coding and then set link rate
@ -758,15 +745,10 @@ void
intel_dp_dump_link_status(struct intel_dp *intel_dp, enum drm_dp_phy dp_phy, intel_dp_dump_link_status(struct intel_dp *intel_dp, enum drm_dp_phy dp_phy,
const u8 link_status[DP_LINK_STATUS_SIZE]) const u8 link_status[DP_LINK_STATUS_SIZE])
{ {
struct intel_encoder *encoder = &dp_to_dig_port(intel_dp)->base; lt_dbg(intel_dp, dp_phy,
struct drm_i915_private *i915 = to_i915(encoder->base.dev); "ln0_1:0x%x ln2_3:0x%x align:0x%x sink:0x%x adj_req0_1:0x%x adj_req2_3:0x%x\n",
link_status[0], link_status[1], link_status[2],
drm_dbg_kms(&i915->drm, link_status[3], link_status[4], link_status[5]);
"[ENCODER:%d:%s][%s] ln0_1:0x%x ln2_3:0x%x align:0x%x sink:0x%x adj_req0_1:0x%x adj_req2_3:0x%x\n",
encoder->base.base.id, encoder->base.name,
drm_dp_phy_name(dp_phy),
link_status[0], link_status[1], link_status[2],
link_status[3], link_status[4], link_status[5]);
} }
/* /*
@ -778,8 +760,6 @@ intel_dp_link_training_clock_recovery(struct intel_dp *intel_dp,
const struct intel_crtc_state *crtc_state, const struct intel_crtc_state *crtc_state,
enum drm_dp_phy dp_phy) enum drm_dp_phy dp_phy)
{ {
struct intel_encoder *encoder = &dp_to_dig_port(intel_dp)->base;
struct drm_i915_private *i915 = to_i915(encoder->base.dev);
u8 old_link_status[DP_LINK_STATUS_SIZE] = {}; u8 old_link_status[DP_LINK_STATUS_SIZE] = {};
int voltage_tries, cr_tries, max_cr_tries; int voltage_tries, cr_tries, max_cr_tries;
u8 link_status[DP_LINK_STATUS_SIZE]; u8 link_status[DP_LINK_STATUS_SIZE];
@ -794,9 +774,7 @@ intel_dp_link_training_clock_recovery(struct intel_dp *intel_dp,
if (!intel_dp_reset_link_train(intel_dp, crtc_state, dp_phy, if (!intel_dp_reset_link_train(intel_dp, crtc_state, dp_phy,
DP_TRAINING_PATTERN_1 | DP_TRAINING_PATTERN_1 |
DP_LINK_SCRAMBLING_DISABLE)) { DP_LINK_SCRAMBLING_DISABLE)) {
drm_err(&i915->drm, "[ENCODER:%d:%s][%s] Failed to enable link training\n", lt_err(intel_dp, dp_phy, "Failed to enable link training\n");
encoder->base.base.id, encoder->base.name,
drm_dp_phy_name(dp_phy));
return false; return false;
} }
@ -819,35 +797,24 @@ intel_dp_link_training_clock_recovery(struct intel_dp *intel_dp,
if (drm_dp_dpcd_read_phy_link_status(&intel_dp->aux, dp_phy, if (drm_dp_dpcd_read_phy_link_status(&intel_dp->aux, dp_phy,
link_status) < 0) { link_status) < 0) {
drm_err(&i915->drm, "[ENCODER:%d:%s][%s] Failed to get link status\n", lt_err(intel_dp, dp_phy, "Failed to get link status\n");
encoder->base.base.id, encoder->base.name,
drm_dp_phy_name(dp_phy));
return false; return false;
} }
if (drm_dp_clock_recovery_ok(link_status, crtc_state->lane_count)) { if (drm_dp_clock_recovery_ok(link_status, crtc_state->lane_count)) {
drm_dbg_kms(&i915->drm, lt_dbg(intel_dp, dp_phy, "Clock recovery OK\n");
"[ENCODER:%d:%s][%s] Clock recovery OK\n",
encoder->base.base.id, encoder->base.name,
drm_dp_phy_name(dp_phy));
return true; return true;
} }
if (voltage_tries == 5) { if (voltage_tries == 5) {
intel_dp_dump_link_status(intel_dp, dp_phy, link_status); intel_dp_dump_link_status(intel_dp, dp_phy, link_status);
drm_dbg_kms(&i915->drm, lt_dbg(intel_dp, dp_phy, "Same voltage tried 5 times\n");
"[ENCODER:%d:%s][%s] Same voltage tried 5 times\n",
encoder->base.base.id, encoder->base.name,
drm_dp_phy_name(dp_phy));
return false; return false;
} }
if (max_vswing_reached) { if (max_vswing_reached) {
intel_dp_dump_link_status(intel_dp, dp_phy, link_status); intel_dp_dump_link_status(intel_dp, dp_phy, link_status);
drm_dbg_kms(&i915->drm, lt_dbg(intel_dp, dp_phy, "Max Voltage Swing reached\n");
"[ENCODER:%d:%s][%s] Max Voltage Swing reached\n",
encoder->base.base.id, encoder->base.name,
drm_dp_phy_name(dp_phy));
return false; return false;
} }
@ -855,10 +822,7 @@ intel_dp_link_training_clock_recovery(struct intel_dp *intel_dp,
intel_dp_get_adjust_train(intel_dp, crtc_state, dp_phy, intel_dp_get_adjust_train(intel_dp, crtc_state, dp_phy,
link_status); link_status);
if (!intel_dp_update_link_train(intel_dp, crtc_state, dp_phy)) { if (!intel_dp_update_link_train(intel_dp, crtc_state, dp_phy)) {
drm_err(&i915->drm, lt_err(intel_dp, dp_phy, "Failed to update link training\n");
"[ENCODER:%d:%s][%s] Failed to update link training\n",
encoder->base.base.id, encoder->base.name,
drm_dp_phy_name(dp_phy));
return false; return false;
} }
@ -874,10 +838,8 @@ intel_dp_link_training_clock_recovery(struct intel_dp *intel_dp,
} }
intel_dp_dump_link_status(intel_dp, dp_phy, link_status); intel_dp_dump_link_status(intel_dp, dp_phy, link_status);
drm_err(&i915->drm, lt_err(intel_dp, dp_phy, "Failed clock recovery %d times, giving up!\n",
"[ENCODER:%d:%s][%s] Failed clock recovery %d times, giving up!\n", max_cr_tries);
encoder->base.base.id, encoder->base.name,
drm_dp_phy_name(dp_phy), max_cr_tries);
return false; return false;
} }
@ -911,11 +873,11 @@ static u32 intel_dp_training_pattern(struct intel_dp *intel_dp,
return DP_TRAINING_PATTERN_4; return DP_TRAINING_PATTERN_4;
} else if (crtc_state->port_clock == 810000) { } else if (crtc_state->port_clock == 810000) {
if (!source_tps4) if (!source_tps4)
drm_dbg_kms(&i915->drm, lt_dbg(intel_dp, dp_phy,
"8.1 Gbps link rate without source TPS4 support\n"); "8.1 Gbps link rate without source TPS4 support\n");
if (!sink_tps4) if (!sink_tps4)
drm_dbg_kms(&i915->drm, lt_dbg(intel_dp, dp_phy,
"8.1 Gbps link rate without sink TPS4 support\n"); "8.1 Gbps link rate without sink TPS4 support\n");
} }
/* /*
@ -929,11 +891,11 @@ static u32 intel_dp_training_pattern(struct intel_dp *intel_dp,
return DP_TRAINING_PATTERN_3; return DP_TRAINING_PATTERN_3;
} else if (crtc_state->port_clock >= 540000) { } else if (crtc_state->port_clock >= 540000) {
if (!source_tps3) if (!source_tps3)
drm_dbg_kms(&i915->drm, lt_dbg(intel_dp, dp_phy,
">=5.4/6.48 Gbps link rate without source TPS3 support\n"); ">=5.4/6.48 Gbps link rate without source TPS3 support\n");
if (!sink_tps3) if (!sink_tps3)
drm_dbg_kms(&i915->drm, lt_dbg(intel_dp, dp_phy,
">=5.4/6.48 Gbps link rate without sink TPS3 support\n"); ">=5.4/6.48 Gbps link rate without sink TPS3 support\n");
} }
return DP_TRAINING_PATTERN_2; return DP_TRAINING_PATTERN_2;
@ -949,8 +911,6 @@ intel_dp_link_training_channel_equalization(struct intel_dp *intel_dp,
const struct intel_crtc_state *crtc_state, const struct intel_crtc_state *crtc_state,
enum drm_dp_phy dp_phy) enum drm_dp_phy dp_phy)
{ {
struct intel_encoder *encoder = &dp_to_dig_port(intel_dp)->base;
struct drm_i915_private *i915 = to_i915(encoder->base.dev);
int tries; int tries;
u32 training_pattern; u32 training_pattern;
u8 link_status[DP_LINK_STATUS_SIZE]; u8 link_status[DP_LINK_STATUS_SIZE];
@ -969,10 +929,7 @@ intel_dp_link_training_channel_equalization(struct intel_dp *intel_dp,
/* channel equalization */ /* channel equalization */
if (!intel_dp_set_link_train(intel_dp, crtc_state, dp_phy, if (!intel_dp_set_link_train(intel_dp, crtc_state, dp_phy,
training_pattern)) { training_pattern)) {
drm_err(&i915->drm, lt_err(intel_dp, dp_phy, "Failed to start channel equalization\n");
"[ENCODER:%d:%s][%s] Failed to start channel equalization\n",
encoder->base.base.id, encoder->base.name,
drm_dp_phy_name(dp_phy));
return false; return false;
} }
@ -981,10 +938,7 @@ intel_dp_link_training_channel_equalization(struct intel_dp *intel_dp,
if (drm_dp_dpcd_read_phy_link_status(&intel_dp->aux, dp_phy, if (drm_dp_dpcd_read_phy_link_status(&intel_dp->aux, dp_phy,
link_status) < 0) { link_status) < 0) {
drm_err(&i915->drm, lt_err(intel_dp, dp_phy, "Failed to get link status\n");
"[ENCODER:%d:%s][%s] Failed to get link status\n",
encoder->base.base.id, encoder->base.name,
drm_dp_phy_name(dp_phy));
break; break;
} }
@ -992,21 +946,15 @@ intel_dp_link_training_channel_equalization(struct intel_dp *intel_dp,
if (!drm_dp_clock_recovery_ok(link_status, if (!drm_dp_clock_recovery_ok(link_status,
crtc_state->lane_count)) { crtc_state->lane_count)) {
intel_dp_dump_link_status(intel_dp, dp_phy, link_status); intel_dp_dump_link_status(intel_dp, dp_phy, link_status);
drm_dbg_kms(&i915->drm, lt_dbg(intel_dp, dp_phy,
"[ENCODER:%d:%s][%s] Clock recovery check failed, cannot " "Clock recovery check failed, cannot continue channel equalization\n");
"continue channel equalization\n",
encoder->base.base.id, encoder->base.name,
drm_dp_phy_name(dp_phy));
break; break;
} }
if (drm_dp_channel_eq_ok(link_status, if (drm_dp_channel_eq_ok(link_status,
crtc_state->lane_count)) { crtc_state->lane_count)) {
channel_eq = true; channel_eq = true;
drm_dbg_kms(&i915->drm, lt_dbg(intel_dp, dp_phy, "Channel EQ done. DP Training successful\n");
"[ENCODER:%d:%s][%s] Channel EQ done. DP Training successful\n",
encoder->base.base.id, encoder->base.name,
drm_dp_phy_name(dp_phy));
break; break;
} }
@ -1014,10 +962,7 @@ intel_dp_link_training_channel_equalization(struct intel_dp *intel_dp,
intel_dp_get_adjust_train(intel_dp, crtc_state, dp_phy, intel_dp_get_adjust_train(intel_dp, crtc_state, dp_phy,
link_status); link_status);
if (!intel_dp_update_link_train(intel_dp, crtc_state, dp_phy)) { if (!intel_dp_update_link_train(intel_dp, crtc_state, dp_phy)) {
drm_err(&i915->drm, lt_err(intel_dp, dp_phy, "Failed to update link training\n");
"[ENCODER:%d:%s][%s] Failed to update link training\n",
encoder->base.base.id, encoder->base.name,
drm_dp_phy_name(dp_phy));
break; break;
} }
} }
@ -1025,10 +970,7 @@ intel_dp_link_training_channel_equalization(struct intel_dp *intel_dp,
/* Try 5 times, else fail and try at lower BW */ /* Try 5 times, else fail and try at lower BW */
if (tries == 5) { if (tries == 5) {
intel_dp_dump_link_status(intel_dp, dp_phy, link_status); intel_dp_dump_link_status(intel_dp, dp_phy, link_status);
drm_dbg_kms(&i915->drm, lt_dbg(intel_dp, dp_phy, "Channel equalization failed 5 times\n");
"[ENCODER:%d:%s][%s] Channel equalization failed 5 times\n",
encoder->base.base.id, encoder->base.name,
drm_dp_phy_name(dp_phy));
} }
return channel_eq; return channel_eq;
@ -1047,13 +989,12 @@ static int
intel_dp_128b132b_intra_hop(struct intel_dp *intel_dp, intel_dp_128b132b_intra_hop(struct intel_dp *intel_dp,
const struct intel_crtc_state *crtc_state) const struct intel_crtc_state *crtc_state)
{ {
struct drm_i915_private *i915 = dp_to_i915(intel_dp);
u8 sink_status; u8 sink_status;
int ret; int ret;
ret = drm_dp_dpcd_readb(&intel_dp->aux, DP_SINK_STATUS, &sink_status); ret = drm_dp_dpcd_readb(&intel_dp->aux, DP_SINK_STATUS, &sink_status);
if (ret != 1) { if (ret != 1) {
drm_dbg_kms(&i915->drm, "Failed to read sink status\n"); lt_dbg(intel_dp, DP_PHY_DPRX, "Failed to read sink status\n");
return ret < 0 ? ret : -EIO; return ret < 0 ? ret : -EIO;
} }
@ -1079,9 +1020,6 @@ intel_dp_128b132b_intra_hop(struct intel_dp *intel_dp,
void intel_dp_stop_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) const struct intel_crtc_state *crtc_state)
{ {
struct drm_i915_private *i915 = dp_to_i915(intel_dp);
struct intel_encoder *encoder = &dp_to_dig_port(intel_dp)->base;
intel_dp->link_trained = true; intel_dp->link_trained = true;
intel_dp_disable_dpcd_training_pattern(intel_dp, DP_PHY_DPRX); intel_dp_disable_dpcd_training_pattern(intel_dp, DP_PHY_DPRX);
@ -1090,9 +1028,7 @@ void intel_dp_stop_link_train(struct intel_dp *intel_dp,
if (intel_dp_is_uhbr(crtc_state) && if (intel_dp_is_uhbr(crtc_state) &&
wait_for(intel_dp_128b132b_intra_hop(intel_dp, crtc_state) == 0, 500)) { wait_for(intel_dp_128b132b_intra_hop(intel_dp, crtc_state) == 0, 500)) {
drm_dbg_kms(&i915->drm, lt_dbg(intel_dp, DP_PHY_DPRX, "128b/132b intra-hop not clearing\n");
"[ENCODER:%d:%s] 128b/132b intra-hop not clearing\n",
encoder->base.base.id, encoder->base.name);
} }
} }
@ -1101,8 +1037,6 @@ intel_dp_link_train_phy(struct intel_dp *intel_dp,
const struct intel_crtc_state *crtc_state, const struct intel_crtc_state *crtc_state,
enum drm_dp_phy dp_phy) enum drm_dp_phy dp_phy)
{ {
struct intel_connector *connector = intel_dp->attached_connector;
struct intel_encoder *encoder = &dp_to_dig_port(intel_dp)->base;
bool ret = false; bool ret = false;
if (!intel_dp_link_training_clock_recovery(intel_dp, crtc_state, dp_phy)) if (!intel_dp_link_training_clock_recovery(intel_dp, crtc_state, dp_phy))
@ -1114,13 +1048,10 @@ intel_dp_link_train_phy(struct intel_dp *intel_dp,
ret = true; ret = true;
out: out:
drm_dbg_kms(&dp_to_i915(intel_dp)->drm, lt_dbg(intel_dp, dp_phy,
"[CONNECTOR:%d:%s][ENCODER:%d:%s][%s] Link Training %s at link rate = %d, lane count = %d\n", "Link Training %s at link rate = %d, lane count = %d\n",
connector->base.base.id, connector->base.name, ret ? "passed" : "failed",
encoder->base.base.id, encoder->base.name, crtc_state->port_clock, crtc_state->lane_count);
drm_dp_phy_name(dp_phy),
ret ? "passed" : "failed",
crtc_state->port_clock, crtc_state->lane_count);
return ret; return ret;
} }
@ -1129,13 +1060,10 @@ static void intel_dp_schedule_fallback_link_training(struct intel_dp *intel_dp,
const struct intel_crtc_state *crtc_state) const struct intel_crtc_state *crtc_state)
{ {
struct intel_connector *intel_connector = intel_dp->attached_connector; struct intel_connector *intel_connector = intel_dp->attached_connector;
struct intel_encoder *encoder = &dp_to_dig_port(intel_dp)->base;
if (intel_dp->hobl_active) { if (intel_dp->hobl_active) {
drm_dbg_kms(&dp_to_i915(intel_dp)->drm, lt_dbg(intel_dp, DP_PHY_DPRX,
"[ENCODER:%d:%s] Link Training failed with HOBL active, " "Link Training failed with HOBL active, not enabling it from now on\n");
"not enabling it from now on",
encoder->base.base.id, encoder->base.name);
intel_dp->hobl_failed = true; intel_dp->hobl_failed = true;
} else if (intel_dp_get_link_train_fallback_values(intel_dp, } else if (intel_dp_get_link_train_fallback_values(intel_dp,
crtc_state->port_clock, crtc_state->port_clock,
@ -1182,8 +1110,6 @@ static bool
intel_dp_128b132b_lane_eq(struct intel_dp *intel_dp, intel_dp_128b132b_lane_eq(struct intel_dp *intel_dp,
const struct intel_crtc_state *crtc_state) const struct intel_crtc_state *crtc_state)
{ {
struct intel_encoder *encoder = &dp_to_dig_port(intel_dp)->base;
struct drm_i915_private *i915 = to_i915(encoder->base.dev);
u8 link_status[DP_LINK_STATUS_SIZE]; u8 link_status[DP_LINK_STATUS_SIZE];
int delay_us; int delay_us;
int try, max_tries = 20; int try, max_tries = 20;
@ -1198,9 +1124,7 @@ intel_dp_128b132b_lane_eq(struct intel_dp *intel_dp,
*/ */
if (!intel_dp_reset_link_train(intel_dp, crtc_state, DP_PHY_DPRX, if (!intel_dp_reset_link_train(intel_dp, crtc_state, DP_PHY_DPRX,
DP_TRAINING_PATTERN_1)) { DP_TRAINING_PATTERN_1)) {
drm_err(&i915->drm, lt_err(intel_dp, DP_PHY_DPRX, "Failed to start 128b/132b TPS1\n");
"[ENCODER:%d:%s] Failed to start 128b/132b TPS1\n",
encoder->base.base.id, encoder->base.name);
return false; return false;
} }
@ -1208,27 +1132,21 @@ intel_dp_128b132b_lane_eq(struct intel_dp *intel_dp,
/* Read the initial TX FFE settings. */ /* Read the initial TX FFE settings. */
if (drm_dp_dpcd_read_link_status(&intel_dp->aux, link_status) < 0) { if (drm_dp_dpcd_read_link_status(&intel_dp->aux, link_status) < 0) {
drm_err(&i915->drm, lt_err(intel_dp, DP_PHY_DPRX, "Failed to read TX FFE presets\n");
"[ENCODER:%d:%s] Failed to read TX FFE presets\n",
encoder->base.base.id, encoder->base.name);
return false; return false;
} }
/* Update signal levels and training set as requested. */ /* Update signal levels and training set as requested. */
intel_dp_get_adjust_train(intel_dp, crtc_state, DP_PHY_DPRX, link_status); intel_dp_get_adjust_train(intel_dp, crtc_state, DP_PHY_DPRX, link_status);
if (!intel_dp_update_link_train(intel_dp, crtc_state, DP_PHY_DPRX)) { if (!intel_dp_update_link_train(intel_dp, crtc_state, DP_PHY_DPRX)) {
drm_err(&i915->drm, lt_err(intel_dp, DP_PHY_DPRX, "Failed to set initial TX FFE settings\n");
"[ENCODER:%d:%s] Failed to set initial TX FFE settings\n",
encoder->base.base.id, encoder->base.name);
return false; return false;
} }
/* Start transmitting 128b/132b TPS2. */ /* Start transmitting 128b/132b TPS2. */
if (!intel_dp_set_link_train(intel_dp, crtc_state, DP_PHY_DPRX, if (!intel_dp_set_link_train(intel_dp, crtc_state, DP_PHY_DPRX,
DP_TRAINING_PATTERN_2)) { DP_TRAINING_PATTERN_2)) {
drm_err(&i915->drm, lt_err(intel_dp, DP_PHY_DPRX, "Failed to start 128b/132b TPS2\n");
"[ENCODER:%d:%s] Failed to start 128b/132b TPS2\n",
encoder->base.base.id, encoder->base.name);
return false; return false;
} }
@ -1245,32 +1163,25 @@ intel_dp_128b132b_lane_eq(struct intel_dp *intel_dp,
delay_us = drm_dp_128b132b_read_aux_rd_interval(&intel_dp->aux); delay_us = drm_dp_128b132b_read_aux_rd_interval(&intel_dp->aux);
if (drm_dp_dpcd_read_link_status(&intel_dp->aux, link_status) < 0) { if (drm_dp_dpcd_read_link_status(&intel_dp->aux, link_status) < 0) {
drm_err(&i915->drm, lt_err(intel_dp, DP_PHY_DPRX, "Failed to read link status\n");
"[ENCODER:%d:%s] Failed to read link status\n",
encoder->base.base.id, encoder->base.name);
return false; return false;
} }
if (drm_dp_128b132b_link_training_failed(link_status)) { if (drm_dp_128b132b_link_training_failed(link_status)) {
intel_dp_dump_link_status(intel_dp, DP_PHY_DPRX, link_status); intel_dp_dump_link_status(intel_dp, DP_PHY_DPRX, link_status);
drm_err(&i915->drm, lt_err(intel_dp, DP_PHY_DPRX,
"[ENCODER:%d:%s] Downstream link training failure\n", "Downstream link training failure\n");
encoder->base.base.id, encoder->base.name);
return false; return false;
} }
if (drm_dp_128b132b_lane_channel_eq_done(link_status, crtc_state->lane_count)) { if (drm_dp_128b132b_lane_channel_eq_done(link_status, crtc_state->lane_count)) {
drm_dbg_kms(&i915->drm, lt_dbg(intel_dp, DP_PHY_DPRX, "Lane channel eq done\n");
"[ENCODER:%d:%s] Lane channel eq done\n",
encoder->base.base.id, encoder->base.name);
break; break;
} }
if (timeout) { if (timeout) {
intel_dp_dump_link_status(intel_dp, DP_PHY_DPRX, link_status); intel_dp_dump_link_status(intel_dp, DP_PHY_DPRX, link_status);
drm_err(&i915->drm, lt_err(intel_dp, DP_PHY_DPRX, "Lane channel eq timeout\n");
"[ENCODER:%d:%s] Lane channel eq timeout\n",
encoder->base.base.id, encoder->base.name);
return false; return false;
} }
@ -1280,18 +1191,14 @@ intel_dp_128b132b_lane_eq(struct intel_dp *intel_dp,
/* Update signal levels and training set as requested. */ /* Update signal levels and training set as requested. */
intel_dp_get_adjust_train(intel_dp, crtc_state, DP_PHY_DPRX, link_status); intel_dp_get_adjust_train(intel_dp, crtc_state, DP_PHY_DPRX, link_status);
if (!intel_dp_update_link_train(intel_dp, crtc_state, DP_PHY_DPRX)) { if (!intel_dp_update_link_train(intel_dp, crtc_state, DP_PHY_DPRX)) {
drm_err(&i915->drm, lt_err(intel_dp, DP_PHY_DPRX, "Failed to update TX FFE settings\n");
"[ENCODER:%d:%s] Failed to update TX FFE settings\n",
encoder->base.base.id, encoder->base.name);
return false; return false;
} }
} }
if (try == max_tries) { if (try == max_tries) {
intel_dp_dump_link_status(intel_dp, DP_PHY_DPRX, link_status); intel_dp_dump_link_status(intel_dp, DP_PHY_DPRX, link_status);
drm_err(&i915->drm, lt_err(intel_dp, DP_PHY_DPRX, "Max loop count reached\n");
"[ENCODER:%d:%s] Max loop count reached\n",
encoder->base.base.id, encoder->base.name);
return false; return false;
} }
@ -1300,32 +1207,24 @@ intel_dp_128b132b_lane_eq(struct intel_dp *intel_dp,
timeout = true; /* try one last time after deadline */ timeout = true; /* try one last time after deadline */
if (drm_dp_dpcd_read_link_status(&intel_dp->aux, link_status) < 0) { if (drm_dp_dpcd_read_link_status(&intel_dp->aux, link_status) < 0) {
drm_err(&i915->drm, lt_err(intel_dp, DP_PHY_DPRX, "Failed to read link status\n");
"[ENCODER:%d:%s] Failed to read link status\n",
encoder->base.base.id, encoder->base.name);
return false; return false;
} }
if (drm_dp_128b132b_link_training_failed(link_status)) { if (drm_dp_128b132b_link_training_failed(link_status)) {
intel_dp_dump_link_status(intel_dp, DP_PHY_DPRX, link_status); intel_dp_dump_link_status(intel_dp, DP_PHY_DPRX, link_status);
drm_err(&i915->drm, lt_err(intel_dp, DP_PHY_DPRX, "Downstream link training failure\n");
"[ENCODER:%d:%s] Downstream link training failure\n",
encoder->base.base.id, encoder->base.name);
return false; return false;
} }
if (drm_dp_128b132b_eq_interlane_align_done(link_status)) { if (drm_dp_128b132b_eq_interlane_align_done(link_status)) {
drm_dbg_kms(&i915->drm, lt_dbg(intel_dp, DP_PHY_DPRX, "Interlane align done\n");
"[ENCODER:%d:%s] Interlane align done\n",
encoder->base.base.id, encoder->base.name);
break; break;
} }
if (timeout) { if (timeout) {
intel_dp_dump_link_status(intel_dp, DP_PHY_DPRX, link_status); intel_dp_dump_link_status(intel_dp, DP_PHY_DPRX, link_status);
drm_err(&i915->drm, lt_err(intel_dp, DP_PHY_DPRX, "Interlane align timeout\n");
"[ENCODER:%d:%s] Interlane align timeout\n",
encoder->base.base.id, encoder->base.name);
return false; return false;
} }
@ -1343,16 +1242,12 @@ intel_dp_128b132b_lane_cds(struct intel_dp *intel_dp,
const struct intel_crtc_state *crtc_state, const struct intel_crtc_state *crtc_state,
int lttpr_count) int lttpr_count)
{ {
struct intel_encoder *encoder = &dp_to_dig_port(intel_dp)->base;
struct drm_i915_private *i915 = to_i915(encoder->base.dev);
u8 link_status[DP_LINK_STATUS_SIZE]; u8 link_status[DP_LINK_STATUS_SIZE];
unsigned long deadline; unsigned long deadline;
if (drm_dp_dpcd_writeb(&intel_dp->aux, DP_TRAINING_PATTERN_SET, if (drm_dp_dpcd_writeb(&intel_dp->aux, DP_TRAINING_PATTERN_SET,
DP_TRAINING_PATTERN_2_CDS) != 1) { DP_TRAINING_PATTERN_2_CDS) != 1) {
drm_err(&i915->drm, lt_err(intel_dp, DP_PHY_DPRX, "Failed to start 128b/132b TPS2 CDS\n");
"[ENCODER:%d:%s] Failed to start 128b/132b TPS2 CDS\n",
encoder->base.base.id, encoder->base.name);
return false; return false;
} }
@ -1368,34 +1263,26 @@ intel_dp_128b132b_lane_cds(struct intel_dp *intel_dp,
usleep_range(2000, 3000); usleep_range(2000, 3000);
if (drm_dp_dpcd_read_link_status(&intel_dp->aux, link_status) < 0) { if (drm_dp_dpcd_read_link_status(&intel_dp->aux, link_status) < 0) {
drm_err(&i915->drm, lt_err(intel_dp, DP_PHY_DPRX, "Failed to read link status\n");
"[ENCODER:%d:%s] Failed to read link status\n",
encoder->base.base.id, encoder->base.name);
return false; return false;
} }
if (drm_dp_128b132b_eq_interlane_align_done(link_status) && if (drm_dp_128b132b_eq_interlane_align_done(link_status) &&
drm_dp_128b132b_cds_interlane_align_done(link_status) && drm_dp_128b132b_cds_interlane_align_done(link_status) &&
drm_dp_128b132b_lane_symbol_locked(link_status, crtc_state->lane_count)) { drm_dp_128b132b_lane_symbol_locked(link_status, crtc_state->lane_count)) {
drm_dbg_kms(&i915->drm, lt_err(intel_dp, DP_PHY_DPRX, "CDS interlane align done\n");
"[ENCODER:%d:%s] CDS interlane align done\n",
encoder->base.base.id, encoder->base.name);
break; break;
} }
if (drm_dp_128b132b_link_training_failed(link_status)) { if (drm_dp_128b132b_link_training_failed(link_status)) {
intel_dp_dump_link_status(intel_dp, DP_PHY_DPRX, link_status); intel_dp_dump_link_status(intel_dp, DP_PHY_DPRX, link_status);
drm_err(&i915->drm, lt_err(intel_dp, DP_PHY_DPRX, "Downstream link training failure\n");
"[ENCODER:%d:%s] Downstream link training failure\n",
encoder->base.base.id, encoder->base.name);
return false; return false;
} }
if (timeout) { if (timeout) {
intel_dp_dump_link_status(intel_dp, DP_PHY_DPRX, link_status); intel_dp_dump_link_status(intel_dp, DP_PHY_DPRX, link_status);
drm_err(&i915->drm, lt_err(intel_dp, DP_PHY_DPRX, "CDS timeout\n");
"[ENCODER:%d:%s] CDS timeout\n",
encoder->base.base.id, encoder->base.name);
return false; return false;
} }
} }
@ -1411,15 +1298,10 @@ intel_dp_128b132b_link_train(struct intel_dp *intel_dp,
const struct intel_crtc_state *crtc_state, const struct intel_crtc_state *crtc_state,
int lttpr_count) int lttpr_count)
{ {
struct drm_i915_private *i915 = dp_to_i915(intel_dp);
struct intel_connector *connector = intel_dp->attached_connector;
struct intel_encoder *encoder = &dp_to_dig_port(intel_dp)->base;
bool passed = false; bool passed = false;
if (wait_for(intel_dp_128b132b_intra_hop(intel_dp, crtc_state) == 0, 500)) { if (wait_for(intel_dp_128b132b_intra_hop(intel_dp, crtc_state) == 0, 500)) {
drm_err(&i915->drm, lt_err(intel_dp, DP_PHY_DPRX, "128b/132b intra-hop not clear\n");
"[ENCODER:%d:%s] 128b/132b intra-hop not clear\n",
encoder->base.base.id, encoder->base.name);
return false; return false;
} }
@ -1427,12 +1309,10 @@ intel_dp_128b132b_link_train(struct intel_dp *intel_dp,
intel_dp_128b132b_lane_cds(intel_dp, crtc_state, lttpr_count)) intel_dp_128b132b_lane_cds(intel_dp, crtc_state, lttpr_count))
passed = true; passed = true;
drm_dbg_kms(&i915->drm, lt_dbg(intel_dp, DP_PHY_DPRX,
"[CONNECTOR:%d:%s][ENCODER:%d:%s] 128b/132b Link Training %s at link rate = %d, lane count = %d\n", "128b/132b Link Training %s at link rate = %d, lane count = %d\n",
connector->base.base.id, connector->base.name, passed ? "passed" : "failed",
encoder->base.base.id, encoder->base.name, crtc_state->port_clock, crtc_state->lane_count);
passed ? "passed" : "failed",
crtc_state->port_clock, crtc_state->lane_count);
return passed; return passed;
} }
@ -1451,8 +1331,6 @@ void intel_dp_start_link_train(struct intel_dp *intel_dp,
const struct intel_crtc_state *crtc_state) const struct intel_crtc_state *crtc_state)
{ {
struct drm_i915_private *i915 = dp_to_i915(intel_dp); struct drm_i915_private *i915 = dp_to_i915(intel_dp);
struct intel_connector *connector = intel_dp->attached_connector;
struct intel_encoder *encoder = &dp_to_dig_port(intel_dp)->base;
bool passed; bool passed;
/* /*
@ -1485,10 +1363,7 @@ void intel_dp_start_link_train(struct intel_dp *intel_dp,
* ignore_long_hpd flag can unset from the testcase. * ignore_long_hpd flag can unset from the testcase.
*/ */
if (!passed && i915->display.hotplug.ignore_long_hpd) { if (!passed && i915->display.hotplug.ignore_long_hpd) {
drm_dbg_kms(&i915->drm, lt_dbg(intel_dp, DP_PHY_DPRX, "Ignore the link failure\n");
"[CONNECTOR:%d:%s][ENCODER:%d:%s] Ignore the link failure\n",
connector->base.base.id, connector->base.name,
encoder->base.base.id, encoder->base.name);
return; return;
} }
@ -1499,8 +1374,6 @@ void intel_dp_start_link_train(struct intel_dp *intel_dp,
void intel_dp_128b132b_sdp_crc16(struct intel_dp *intel_dp, void intel_dp_128b132b_sdp_crc16(struct intel_dp *intel_dp,
const struct intel_crtc_state *crtc_state) const struct intel_crtc_state *crtc_state)
{ {
struct drm_i915_private *i915 = dp_to_i915(intel_dp);
/* /*
* VIDEO_DIP_CTL register bit 31 should be set to '0' to not * VIDEO_DIP_CTL register bit 31 should be set to '0' to not
* disable SDP CRC. This is applicable for Display version 13. * disable SDP CRC. This is applicable for Display version 13.
@ -1513,5 +1386,5 @@ void intel_dp_128b132b_sdp_crc16(struct intel_dp *intel_dp,
DP_SDP_ERROR_DETECTION_CONFIGURATION, DP_SDP_ERROR_DETECTION_CONFIGURATION,
DP_SDP_CRC16_128B132B_EN); DP_SDP_CRC16_128B132B_EN);
drm_dbg_kms(&i915->drm, "DP2.0 SDP CRC16 for 128b/132b enabled\n"); lt_dbg(intel_dp, DP_PHY_DPRX, "DP2.0 SDP CRC16 for 128b/132b enabled\n");
} }