On Fri, Apr 28, 2023 at 05:21:53PM +0300, Ville Syrjälä wrote:
> On Wed, Apr 26, 2023 at 07:53:00PM +0300, Imre Deak wrote:
> > Add functions for printing link training debug and error messages, both
> > to prepare for the next patch, which downgrades an error to debug if the
> > sink is disconnected and to remove some code duplication.
> >
> > Signed-off-by: Imre Deak <imre.d...@intel.com>
> > ---
> > .../drm/i915/display/intel_dp_link_training.c | 376 +++++++-----------
> > 1 file changed, 139 insertions(+), 237 deletions(-)
> >
> > diff --git a/drivers/gpu/drm/i915/display/intel_dp_link_training.c
> > b/drivers/gpu/drm/i915/display/intel_dp_link_training.c
> > index 6aa4ae5e7ebe3..12f2880e474ed 100644
> > --- a/drivers/gpu/drm/i915/display/intel_dp_link_training.c
> > +++ b/drivers/gpu/drm/i915/display/intel_dp_link_training.c
> > @@ -26,6 +26,47 @@
> > #include "intel_dp.h"
> > #include "intel_dp_link_training.h"
> >
> > +__printf(5, 6)
> > +static void lt_msg(struct intel_connector *connector, struct intel_dp
> > *intel_dp, enum drm_dp_phy dp_phy,
> > + bool is_error, const char *format, ...)
>
> I pretty much hate custom debug/error print functions. Makes it
> hard togrep/etc. and just generally causes more "wtf is this?"
> moments when reading the code. Unfortunateely the macro hell in
> drm_print.h seems to make it really hard to do anything generic
> directly :(
I guess could use something like drm_printf(&intel_dp->printer, ...)
instead, but that would still need passing the PHY format prefix at each
callsite.
>
> > +{
> > + struct drm_i915_private *i915 = dp_to_i915(intel_dp);
> > + struct intel_encoder *encoder = &dp_to_dig_port(intel_dp)->base;
> > + char conn_str[128] = {};
> > + struct va_format vaf;
> > + va_list args;
> > +
> > + va_start(args, format);
> > + vaf.fmt = format;
> > + vaf.va = &args;
> > +
> > + if (connector)
> > + snprintf(conn_str, sizeof(conn_str), "[CONNECTOR:%d:%s]",
> > + connector->base.base.id, connector->base.name);
>
> Are there actually places where we don't have/can't get the
> connector?
I guess link training messages could always print
intel_dp->attached_connector (not sure if for MST it's worth / practical
to list all the connectors).
> > +
> > + if (is_error)
> > + drm_err(&i915->drm, "%s[ENCODER:%d:%s][%s] %pV\n",
> > + conn_str,
> > + encoder->base.base.id, encoder->base.name,
> > + drm_dp_phy_name(dp_phy),
> > + &vaf);
> > + else
> > + drm_dbg(&i915->drm, "%s[ENCODER:%d:%s][%s] %pV\n",
>
> That has lost the correct debug category.
Yes, should've been drm_dbg_kms().
>
> > + conn_str,
> > + encoder->base.base.id, encoder->base.name,
> > + drm_dp_phy_name(dp_phy),
> > + &vaf);
>
> Hmm. ___drm_dev_dbg() already uses this vaf stuff.
> Does chaining it like that work correctly?
Didn't think of it, but can't see why not, it's used at least in a few
places like that.
> > +}
> > +
> > +#define lt_err(intel_dp, dp_phy, format, ...) \
> > + lt_msg(NULL, intel_dp, dp_phy, true, format, ## __VA_ARGS__)
> > +
> > +#define lt_dbg(intel_dp, dp_phy, format, ...) \
> > + lt_msg(NULL, intel_dp, dp_phy, false, format, ## __VA_ARGS__)
> > +
> > +#define lt_conn_dbg(connector, intel_dp, dp_phy, format, ...) \
> > + lt_msg(connector, intel_dp, dp_phy, false, format, ## __VA_ARGS__)
> > +
> > 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));
> > @@ -47,29 +88,21 @@ static void intel_dp_read_lttpr_phy_caps(struct
> > intel_dp *intel_dp,
> > const u8 dpcd[DP_RECEIVER_CAP_SIZE],
> > 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);
> >
> > 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,
> > - "[ENCODER:%d:%s][%s] failed to read the PHY caps\n",
> > - encoder->base.base.id, encoder->base.name,
> > - drm_dp_phy_name(dp_phy));
> > + lt_dbg(intel_dp, dp_phy, "failed to read the PHY caps\n");
> > return;
> > }
> >
> > - drm_dbg_kms(&dp_to_i915(intel_dp)->drm,
> > - "[ENCODER:%d:%s][%s] PHY capabilities: %*ph\n",
> > - encoder->base.base.id, encoder->base.name,
> > - drm_dp_phy_name(dp_phy),
> > - (int)sizeof(intel_dp->lttpr_phy_caps[0]),
> > - phy_caps);
> > + lt_dbg(intel_dp, dp_phy, "PHY capabilities: %*ph\n",
> > + (int)sizeof(intel_dp->lttpr_phy_caps[0]),
> > + phy_caps);
> > }
> >
> > static bool intel_dp_read_lttpr_common_caps(struct intel_dp *intel_dp,
> > const u8 dpcd[DP_RECEIVER_CAP_SIZE])
> > {
> > - struct intel_encoder *encoder = &dp_to_dig_port(intel_dp)->base;
> > int ret;
> >
> > ret = drm_dp_read_lttpr_common_caps(&intel_dp->aux, dpcd,
> > @@ -77,11 +110,9 @@ static bool intel_dp_read_lttpr_common_caps(struct
> > intel_dp *intel_dp,
> > if (ret < 0)
> > goto reset_caps;
> >
> > - drm_dbg_kms(&dp_to_i915(intel_dp)->drm,
> > - "[ENCODER:%d:%s] LTTPR common capabilities: %*ph\n",
> > - encoder->base.base.id, encoder->base.name,
> > - (int)sizeof(intel_dp->lttpr_common_caps),
> > - intel_dp->lttpr_common_caps);
> > + lt_dbg(intel_dp, DP_PHY_DPRX, "LTTPR common capabilities: %*ph\n",
> > + (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 */
> > if (intel_dp->lttpr_common_caps[0] < 0x14)
> > @@ -105,8 +136,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])
> > {
> > - 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 i;
> >
> > @@ -138,9 +167,8 @@ static int intel_dp_init_lttpr(struct intel_dp
> > *intel_dp, const u8 dpcd[DP_RECEI
> > return 0;
> >
> > if (!intel_dp_set_lttpr_transparent_mode(intel_dp, false)) {
> > - drm_dbg_kms(&i915->drm,
> > - "[ENCODER:%d:%s] Switching to LTTPR non-transparent
> > LT mode failed, fall-back to transparent mode\n",
> > - encoder->base.base.id, encoder->base.name);
> > + lt_dbg(intel_dp, DP_PHY_DPRX,
> > + "Switching to LTTPR non-transparent LT mode failed,
> > fall-back to transparent mode\n");
> >
> > intel_dp_set_lttpr_transparent_mode(intel_dp, true);
> > intel_dp_reset_lttpr_count(intel_dp);
> > @@ -409,26 +437,22 @@ intel_dp_get_adjust_train(struct intel_dp *intel_dp,
> > enum drm_dp_phy dp_phy,
> > 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;
> >
> > if (intel_dp_is_uhbr(crtc_state)) {
> > - drm_dbg_kms(&i915->drm, "[ENCODER:%d:%s][%s] 128b/132b, lanes:
> > %d, "
> > - "TX FFE request: " TRAIN_REQ_FMT "\n",
> > - encoder->base.base.id, encoder->base.name,
> > - drm_dp_phy_name(dp_phy),
> > - crtc_state->lane_count,
> > - TRAIN_REQ_TX_FFE_ARGS(link_status));
> > + lt_dbg(intel_dp, dp_phy,
> > + "128b/132b, lanes: %d, "
> > + "TX FFE request: " TRAIN_REQ_FMT "\n",
> > + crtc_state->lane_count,
> > + TRAIN_REQ_TX_FFE_ARGS(link_status));
> > } else {
> > - drm_dbg_kms(&i915->drm, "[ENCODER:%d:%s][%s] 8b/10b, lanes: %d,
> > "
> > - "vswing request: " TRAIN_REQ_FMT ", "
> > - "pre-emphasis request: " TRAIN_REQ_FMT "\n",
> > - encoder->base.base.id, encoder->base.name,
> > - drm_dp_phy_name(dp_phy),
> > - crtc_state->lane_count,
> > - TRAIN_REQ_VSWING_ARGS(link_status),
> > - TRAIN_REQ_PREEMPH_ARGS(link_status));
> > + lt_dbg(intel_dp, dp_phy,
> > + "8b/10b, lanes: %d, "
> > + "vswing request: " TRAIN_REQ_FMT ", "
> > + "pre-emphasis request: " TRAIN_REQ_FMT "\n",
> > + crtc_state->lane_count,
> > + TRAIN_REQ_VSWING_ARGS(link_status),
> > + TRAIN_REQ_PREEMPH_ARGS(link_status));
> > }
> >
> > for (lane = 0; lane < 4; lane++)
> > @@ -487,16 +511,11 @@ intel_dp_program_link_training_pattern(struct
> > intel_dp *intel_dp,
> > 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 *i915 = to_i915(encoder->base.dev);
> > u8 train_pat = intel_dp_training_pattern_symbol(dp_train_pat);
> >
> > if (train_pat != DP_TRAINING_PATTERN_DISABLE)
> > - drm_dbg_kms(&i915->drm,
> > - "[ENCODER:%d:%s][%s] Using DP training pattern
> > TPS%c\n",
> > - encoder->base.base.id, encoder->base.name,
> > - drm_dp_phy_name(dp_phy),
> > - dp_training_pattern_name(train_pat));
> > + lt_dbg(intel_dp, dp_phy, "Using DP training pattern TPS%c\n",
> > + dp_training_pattern_name(train_pat));
> >
> > intel_dp->set_link_train(intel_dp, crtc_state, dp_train_pat);
> > }
> > @@ -531,24 +550,21 @@ void intel_dp_set_signal_levels(struct intel_dp
> > *intel_dp,
> > 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);
> >
> > if (intel_dp_is_uhbr(crtc_state)) {
> > - drm_dbg_kms(&i915->drm, "[ENCODER:%d:%s][%s] 128b/132b, lanes:
> > %d, "
> > - "TX FFE presets: " TRAIN_SET_FMT "\n",
> > - encoder->base.base.id, encoder->base.name,
> > - drm_dp_phy_name(dp_phy),
> > - crtc_state->lane_count,
> > - TRAIN_SET_TX_FFE_ARGS(intel_dp->train_set));
> > + lt_dbg(intel_dp, dp_phy,
> > + "128b/132b, lanes: %d, "
> > + "TX FFE presets: " TRAIN_SET_FMT "\n",
> > + crtc_state->lane_count,
> > + TRAIN_SET_TX_FFE_ARGS(intel_dp->train_set));
> > } else {
> > - drm_dbg_kms(&i915->drm, "[ENCODER:%d:%s][%s] 8b/10b, lanes: %d,
> > "
> > - "vswing levels: " TRAIN_SET_FMT ", "
> > - "pre-emphasis levels: " TRAIN_SET_FMT "\n",
> > - encoder->base.base.id, encoder->base.name,
> > - drm_dp_phy_name(dp_phy),
> > - crtc_state->lane_count,
> > - TRAIN_SET_VSWING_ARGS(intel_dp->train_set),
> > - TRAIN_SET_PREEMPH_ARGS(intel_dp->train_set));
> > + lt_dbg(intel_dp, dp_phy,
> > + "8b/10b, lanes: %d, "
> > + "vswing levels: " TRAIN_SET_FMT ", "
> > + "pre-emphasis levels: " TRAIN_SET_FMT "\n",
> > + crtc_state->lane_count,
> > + TRAIN_SET_VSWING_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))
> > @@ -645,8 +661,6 @@ static bool
> > intel_dp_prepare_link_train(struct intel_dp *intel_dp,
> > 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_config[2];
> > u8 link_bw, rate_select;
> >
> > @@ -671,21 +685,19 @@ intel_dp_prepare_link_train(struct intel_dp *intel_dp,
> > struct intel_connector *connector =
> > intel_dp->attached_connector;
> > __le16 sink_rates[DP_MAX_SUPPORTED_RATES];
> >
> > - drm_dbg_kms(&i915->drm, "[CONNECTOR:%d:%s] Reloading eDP link
> > rates\n",
> > - connector->base.base.id, connector->base.name);
> > + lt_conn_dbg(connector, intel_dp, DP_PHY_DPRX,
> > + "Reloading eDP link rates\n");
> >
> > drm_dp_dpcd_read(&intel_dp->aux, DP_SUPPORTED_LINK_RATES,
> > sink_rates, sizeof(sink_rates));
> > }
> >
> > if (link_bw)
> > - drm_dbg_kms(&i915->drm,
> > - "[ENCODER:%d:%s] Using LINK_BW_SET value %02x\n",
> > - encoder->base.base.id, encoder->base.name, link_bw);
> > + lt_dbg(intel_dp, DP_PHY_DPRX, "Using LINK_BW_SET value %02x\n",
> > + link_bw);
> > else
> > - drm_dbg_kms(&i915->drm,
> > - "[ENCODER:%d:%s] Using LINK_RATE_SET value %02x\n",
> > - encoder->base.base.id, encoder->base.name,
> > rate_select);
> > + lt_dbg(intel_dp, DP_PHY_DPRX, "Using LINK_RATE_SET value
> > %02x\n",
> > + rate_select);
> >
> > /* Write the link configuration data */
> > link_config[0] = link_bw;
> > @@ -737,15 +749,10 @@ 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])
> > {
> > - struct intel_encoder *encoder = &dp_to_dig_port(intel_dp)->base;
> > - struct drm_i915_private *i915 = to_i915(encoder->base.dev);
> > -
> > - drm_dbg_kms(&i915->drm,
> > - "[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]);
> > + lt_dbg(intel_dp, dp_phy,
> > + "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],
> > + link_status[3], link_status[4], link_status[5]);
> > }
> >
> > /*
> > @@ -757,8 +764,6 @@ intel_dp_link_training_clock_recovery(struct intel_dp
> > *intel_dp,
> > const struct intel_crtc_state *crtc_state,
> > 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] = {};
> > int voltage_tries, cr_tries, max_cr_tries;
> > u8 link_status[DP_LINK_STATUS_SIZE];
> > @@ -773,9 +778,7 @@ intel_dp_link_training_clock_recovery(struct intel_dp
> > *intel_dp,
> > if (!intel_dp_reset_link_train(intel_dp, crtc_state, dp_phy,
> > DP_TRAINING_PATTERN_1 |
> > DP_LINK_SCRAMBLING_DISABLE)) {
> > - drm_err(&i915->drm, "[ENCODER:%d:%s][%s] Failed to enable link
> > training\n",
> > - encoder->base.base.id, encoder->base.name,
> > - drm_dp_phy_name(dp_phy));
> > + lt_err(intel_dp, dp_phy, "Failed to enable link training\n");
> > return false;
> > }
> >
> > @@ -798,35 +801,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,
> > link_status) < 0) {
> > - drm_err(&i915->drm, "[ENCODER:%d:%s][%s] Failed to get
> > link status\n",
> > - encoder->base.base.id, encoder->base.name,
> > - drm_dp_phy_name(dp_phy));
> > + lt_err(intel_dp, dp_phy, "Failed to get link status\n");
> > return false;
> > }
> >
> > if (drm_dp_clock_recovery_ok(link_status,
> > crtc_state->lane_count)) {
> > - drm_dbg_kms(&i915->drm,
> > - "[ENCODER:%d:%s][%s] Clock recovery OK\n",
> > - encoder->base.base.id, encoder->base.name,
> > - drm_dp_phy_name(dp_phy));
> > + lt_dbg(intel_dp, dp_phy, "Clock recovery OK\n");
> > return true;
> > }
> >
> > if (voltage_tries == 5) {
> > intel_dp_dump_link_status(intel_dp, dp_phy,
> > link_status);
> > - drm_dbg_kms(&i915->drm,
> > - "[ENCODER:%d:%s][%s] Same voltage tried 5
> > times\n",
> > - encoder->base.base.id, encoder->base.name,
> > - drm_dp_phy_name(dp_phy));
> > + lt_dbg(intel_dp, dp_phy, "Same voltage tried 5
> > times\n");
> > return false;
> > }
> >
> > if (max_vswing_reached) {
> > intel_dp_dump_link_status(intel_dp, dp_phy,
> > link_status);
> > - drm_dbg_kms(&i915->drm,
> > - "[ENCODER:%d:%s][%s] Max Voltage Swing
> > reached\n",
> > - encoder->base.base.id, encoder->base.name,
> > - drm_dp_phy_name(dp_phy));
> > + lt_dbg(intel_dp, dp_phy, "Max Voltage Swing reached\n");
> > return false;
> > }
> >
> > @@ -834,10 +826,7 @@ intel_dp_link_training_clock_recovery(struct intel_dp
> > *intel_dp,
> > intel_dp_get_adjust_train(intel_dp, crtc_state, dp_phy,
> > link_status);
> > if (!intel_dp_update_link_train(intel_dp, crtc_state, dp_phy)) {
> > - drm_err(&i915->drm,
> > - "[ENCODER:%d:%s][%s] Failed to update link
> > training\n",
> > - encoder->base.base.id, encoder->base.name,
> > - drm_dp_phy_name(dp_phy));
> > + lt_err(intel_dp, dp_phy, "Failed to update link
> > training\n");
> > return false;
> > }
> >
> > @@ -853,10 +842,8 @@ intel_dp_link_training_clock_recovery(struct intel_dp
> > *intel_dp,
> > }
> >
> > intel_dp_dump_link_status(intel_dp, dp_phy, link_status);
> > - drm_err(&i915->drm,
> > - "[ENCODER:%d:%s][%s] Failed clock recovery %d times, giving
> > up!\n",
> > - encoder->base.base.id, encoder->base.name,
> > - drm_dp_phy_name(dp_phy), max_cr_tries);
> > + lt_err(intel_dp, dp_phy, "Failed clock recovery %d times, giving up!\n",
> > + max_cr_tries);
> >
> > return false;
> > }
> > @@ -890,11 +877,11 @@ static u32 intel_dp_training_pattern(struct intel_dp
> > *intel_dp,
> > return DP_TRAINING_PATTERN_4;
> > } else if (crtc_state->port_clock == 810000) {
> > if (!source_tps4)
> > - drm_dbg_kms(&i915->drm,
> > - "8.1 Gbps link rate without source TPS4
> > support\n");
> > + lt_dbg(intel_dp, dp_phy,
> > + "8.1 Gbps link rate without source TPS4
> > support\n");
> > if (!sink_tps4)
> > - drm_dbg_kms(&i915->drm,
> > - "8.1 Gbps link rate without sink TPS4
> > support\n");
> > + lt_dbg(intel_dp, dp_phy,
> > + "8.1 Gbps link rate without sink TPS4
> > support\n");
> > }
> >
> > /*
> > @@ -908,11 +895,11 @@ static u32 intel_dp_training_pattern(struct intel_dp
> > *intel_dp,
> > return DP_TRAINING_PATTERN_3;
> > } else if (crtc_state->port_clock >= 540000) {
> > if (!source_tps3)
> > - drm_dbg_kms(&i915->drm,
> > - ">=5.4/6.48 Gbps link rate without source
> > TPS3 support\n");
> > + lt_dbg(intel_dp, dp_phy,
> > + ">=5.4/6.48 Gbps link rate without source TPS3
> > support\n");
> > if (!sink_tps3)
> > - drm_dbg_kms(&i915->drm,
> > - ">=5.4/6.48 Gbps link rate without sink
> > TPS3 support\n");
> > + lt_dbg(intel_dp, dp_phy,
> > + ">=5.4/6.48 Gbps link rate without sink TPS3
> > support\n");
> > }
> >
> > return DP_TRAINING_PATTERN_2;
> > @@ -928,8 +915,6 @@ intel_dp_link_training_channel_equalization(struct
> > intel_dp *intel_dp,
> > const struct intel_crtc_state
> > *crtc_state,
> > 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;
> > u32 training_pattern;
> > u8 link_status[DP_LINK_STATUS_SIZE];
> > @@ -948,10 +933,7 @@ intel_dp_link_training_channel_equalization(struct
> > intel_dp *intel_dp,
> > /* channel equalization */
> > if (!intel_dp_set_link_train(intel_dp, crtc_state, dp_phy,
> > training_pattern)) {
> > - drm_err(&i915->drm,
> > - "[ENCODER:%d:%s][%s] Failed to start channel
> > equalization\n",
> > - encoder->base.base.id, encoder->base.name,
> > - drm_dp_phy_name(dp_phy));
> > + lt_err(intel_dp, dp_phy, "Failed to start channel
> > equalization\n");
> > return false;
> > }
> >
> > @@ -960,10 +942,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,
> > link_status) < 0) {
> > - drm_err(&i915->drm,
> > - "[ENCODER:%d:%s][%s] Failed to get link
> > status\n",
> > - encoder->base.base.id, encoder->base.name,
> > - drm_dp_phy_name(dp_phy));
> > + lt_err(intel_dp, dp_phy, "Failed to get link status\n");
> > break;
> > }
> >
> > @@ -971,21 +950,15 @@ intel_dp_link_training_channel_equalization(struct
> > intel_dp *intel_dp,
> > if (!drm_dp_clock_recovery_ok(link_status,
> > crtc_state->lane_count)) {
> > intel_dp_dump_link_status(intel_dp, dp_phy,
> > link_status);
> > - drm_dbg_kms(&i915->drm,
> > - "[ENCODER:%d:%s][%s] Clock recovery check
> > failed, cannot "
> > - "continue channel equalization\n",
> > - encoder->base.base.id, encoder->base.name,
> > - drm_dp_phy_name(dp_phy));
> > + lt_dbg(intel_dp, dp_phy,
> > + "Clock recovery check failed, cannot continue
> > channel equalization\n");
> > break;
> > }
> >
> > if (drm_dp_channel_eq_ok(link_status,
> > crtc_state->lane_count)) {
> > channel_eq = true;
> > - drm_dbg_kms(&i915->drm,
> > - "[ENCODER:%d:%s][%s] Channel EQ done. DP
> > Training successful\n",
> > - encoder->base.base.id, encoder->base.name,
> > - drm_dp_phy_name(dp_phy));
> > + lt_dbg(intel_dp, dp_phy, "Channel EQ done. DP Training
> > successful\n");
> > break;
> > }
> >
> > @@ -993,10 +966,7 @@ intel_dp_link_training_channel_equalization(struct
> > intel_dp *intel_dp,
> > intel_dp_get_adjust_train(intel_dp, crtc_state, dp_phy,
> > link_status);
> > if (!intel_dp_update_link_train(intel_dp, crtc_state, dp_phy)) {
> > - drm_err(&i915->drm,
> > - "[ENCODER:%d:%s][%s] Failed to update link
> > training\n",
> > - encoder->base.base.id, encoder->base.name,
> > - drm_dp_phy_name(dp_phy));
> > + lt_err(intel_dp, dp_phy, "Failed to update link
> > training\n");
> > break;
> > }
> > }
> > @@ -1004,10 +974,7 @@ intel_dp_link_training_channel_equalization(struct
> > intel_dp *intel_dp,
> > /* Try 5 times, else fail and try at lower BW */
> > if (tries == 5) {
> > intel_dp_dump_link_status(intel_dp, dp_phy, link_status);
> > - drm_dbg_kms(&i915->drm,
> > - "[ENCODER:%d:%s][%s] Channel equalization failed 5
> > times\n",
> > - encoder->base.base.id, encoder->base.name,
> > - drm_dp_phy_name(dp_phy));
> > + lt_dbg(intel_dp, dp_phy, "Channel equalization failed 5
> > times\n");
> > }
> >
> > return channel_eq;
> > @@ -1058,9 +1025,6 @@ intel_dp_128b132b_intra_hop(struct intel_dp *intel_dp,
> > void intel_dp_stop_link_train(struct intel_dp *intel_dp,
> > 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_disable_dpcd_training_pattern(intel_dp, DP_PHY_DPRX);
> > @@ -1069,9 +1033,7 @@ void intel_dp_stop_link_train(struct intel_dp
> > *intel_dp,
> >
> > if (intel_dp_is_uhbr(crtc_state) &&
> > wait_for(intel_dp_128b132b_intra_hop(intel_dp, crtc_state) == 0,
> > 500)) {
> > - drm_dbg_kms(&i915->drm,
> > - "[ENCODER:%d:%s] 128b/132b intra-hop not
> > clearing\n",
> > - encoder->base.base.id, encoder->base.name);
> > + lt_dbg(intel_dp, DP_PHY_DPRX, "128b/132b intra-hop not
> > clearing\n");
> > }
> > }
> >
> > @@ -1081,7 +1043,6 @@ intel_dp_link_train_phy(struct intel_dp *intel_dp,
> > 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;
> >
> > if (!intel_dp_link_training_clock_recovery(intel_dp, crtc_state,
> > dp_phy))
> > @@ -1093,11 +1054,8 @@ intel_dp_link_train_phy(struct intel_dp *intel_dp,
> > ret = true;
> >
> > out:
> > - drm_dbg_kms(&dp_to_i915(intel_dp)->drm,
> > - "[CONNECTOR:%d:%s][ENCODER:%d:%s][%s] Link Training %s at
> > link rate = %d, lane count = %d\n",
> > - connector->base.base.id, connector->base.name,
> > - encoder->base.base.id, encoder->base.name,
> > - drm_dp_phy_name(dp_phy),
> > + lt_conn_dbg(connector, intel_dp, dp_phy,
> > + "Link Training %s at link rate = %d, lane count = %d\n",
> > ret ? "passed" : "failed",
> > crtc_state->port_clock, crtc_state->lane_count);
> >
> > @@ -1108,13 +1066,10 @@ static void
> > intel_dp_schedule_fallback_link_training(struct intel_dp *intel_dp,
> > const struct
> > intel_crtc_state *crtc_state)
> > {
> > 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) {
> > - drm_dbg_kms(&dp_to_i915(intel_dp)->drm,
> > - "[ENCODER:%d:%s] Link Training failed with HOBL
> > active, "
> > - "not enabling it from now on",
> > - encoder->base.base.id, encoder->base.name);
> > + lt_dbg(intel_dp, DP_PHY_DPRX,
> > + "Link Training failed with HOBL active, not enabling it
> > from now on\n");
> > intel_dp->hobl_failed = true;
> > } else if (intel_dp_get_link_train_fallback_values(intel_dp,
> >
> > crtc_state->port_clock,
> > @@ -1161,8 +1116,6 @@ static bool
> > intel_dp_128b132b_lane_eq(struct intel_dp *intel_dp,
> > 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];
> > int delay_us;
> > int try, max_tries = 20;
> > @@ -1177,9 +1130,7 @@ intel_dp_128b132b_lane_eq(struct intel_dp *intel_dp,
> > */
> > if (!intel_dp_reset_link_train(intel_dp, crtc_state, DP_PHY_DPRX,
> > DP_TRAINING_PATTERN_1)) {
> > - drm_err(&i915->drm,
> > - "[ENCODER:%d:%s] Failed to start 128b/132b TPS1\n",
> > - encoder->base.base.id, encoder->base.name);
> > + lt_err(intel_dp, DP_PHY_DPRX, "Failed to start 128b/132b
> > TPS1\n");
> > return false;
> > }
> >
> > @@ -1187,27 +1138,21 @@ intel_dp_128b132b_lane_eq(struct intel_dp *intel_dp,
> >
> > /* Read the initial TX FFE settings. */
> > if (drm_dp_dpcd_read_link_status(&intel_dp->aux, link_status) < 0) {
> > - drm_err(&i915->drm,
> > - "[ENCODER:%d:%s] Failed to read TX FFE presets\n",
> > - encoder->base.base.id, encoder->base.name);
> > + lt_err(intel_dp, DP_PHY_DPRX, "Failed to read TX FFE
> > presets\n");
> > return false;
> > }
> >
> > /* Update signal levels and training set as requested. */
> > 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)) {
> > - drm_err(&i915->drm,
> > - "[ENCODER:%d:%s] Failed to set initial TX FFE
> > settings\n",
> > - encoder->base.base.id, encoder->base.name);
> > + lt_err(intel_dp, DP_PHY_DPRX, "Failed to set initial TX FFE
> > settings\n");
> > return false;
> > }
> >
> > /* Start transmitting 128b/132b TPS2. */
> > if (!intel_dp_set_link_train(intel_dp, crtc_state, DP_PHY_DPRX,
> > DP_TRAINING_PATTERN_2)) {
> > - drm_err(&i915->drm,
> > - "[ENCODER:%d:%s] Failed to start 128b/132b TPS2\n",
> > - encoder->base.base.id, encoder->base.name);
> > + lt_err(intel_dp, DP_PHY_DPRX, "Failed to start 128b/132b
> > TPS2\n");
> > return false;
> > }
> >
> > @@ -1224,32 +1169,25 @@ intel_dp_128b132b_lane_eq(struct intel_dp *intel_dp,
> > 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) {
> > - drm_err(&i915->drm,
> > - "[ENCODER:%d:%s] Failed to read link status\n",
> > - encoder->base.base.id, encoder->base.name);
> > + lt_err(intel_dp, DP_PHY_DPRX, "Failed to read link
> > status\n");
> > return false;
> > }
> >
> > if (drm_dp_128b132b_link_training_failed(link_status)) {
> > intel_dp_dump_link_status(intel_dp, DP_PHY_DPRX,
> > link_status);
> > - drm_err(&i915->drm,
> > - "[ENCODER:%d:%s] Downstream link training
> > failure\n",
> > - encoder->base.base.id, encoder->base.name);
> > + lt_err(intel_dp, DP_PHY_DPRX,
> > + "Downstream link training failure\n");
> > return false;
> > }
> >
> > if (drm_dp_128b132b_lane_channel_eq_done(link_status,
> > crtc_state->lane_count)) {
> > - drm_dbg_kms(&i915->drm,
> > - "[ENCODER:%d:%s] Lane channel eq done\n",
> > - encoder->base.base.id, encoder->base.name);
> > + lt_dbg(intel_dp, DP_PHY_DPRX, "Lane channel eq done\n");
> > break;
> > }
> >
> > if (timeout) {
> > intel_dp_dump_link_status(intel_dp, DP_PHY_DPRX,
> > link_status);
> > - drm_err(&i915->drm,
> > - "[ENCODER:%d:%s] Lane channel eq timeout\n",
> > - encoder->base.base.id, encoder->base.name);
> > + lt_err(intel_dp, DP_PHY_DPRX, "Lane channel eq
> > timeout\n");
> > return false;
> > }
> >
> > @@ -1259,18 +1197,14 @@ intel_dp_128b132b_lane_eq(struct intel_dp *intel_dp,
> > /* Update signal levels and training set as requested. */
> > 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)) {
> > - drm_err(&i915->drm,
> > - "[ENCODER:%d:%s] Failed to update TX FFE
> > settings\n",
> > - encoder->base.base.id, encoder->base.name);
> > + lt_err(intel_dp, DP_PHY_DPRX, "Failed to update TX FFE
> > settings\n");
> > return false;
> > }
> > }
> >
> > if (try == max_tries) {
> > intel_dp_dump_link_status(intel_dp, DP_PHY_DPRX, link_status);
> > - drm_err(&i915->drm,
> > - "[ENCODER:%d:%s] Max loop count reached\n",
> > - encoder->base.base.id, encoder->base.name);
> > + lt_err(intel_dp, DP_PHY_DPRX, "Max loop count reached\n");
> > return false;
> > }
> >
> > @@ -1279,32 +1213,24 @@ intel_dp_128b132b_lane_eq(struct intel_dp *intel_dp,
> > timeout = true; /* try one last time after deadline */
> >
> > if (drm_dp_dpcd_read_link_status(&intel_dp->aux, link_status) <
> > 0) {
> > - drm_err(&i915->drm,
> > - "[ENCODER:%d:%s] Failed to read link status\n",
> > - encoder->base.base.id, encoder->base.name);
> > + lt_err(intel_dp, DP_PHY_DPRX, "Failed to read link
> > status\n");
> > return false;
> > }
> >
> > if (drm_dp_128b132b_link_training_failed(link_status)) {
> > intel_dp_dump_link_status(intel_dp, DP_PHY_DPRX,
> > link_status);
> > - drm_err(&i915->drm,
> > - "[ENCODER:%d:%s] Downstream link training
> > failure\n",
> > - encoder->base.base.id, encoder->base.name);
> > + lt_err(intel_dp, DP_PHY_DPRX, "Downstream link training
> > failure\n");
> > return false;
> > }
> >
> > if (drm_dp_128b132b_eq_interlane_align_done(link_status)) {
> > - drm_dbg_kms(&i915->drm,
> > - "[ENCODER:%d:%s] Interlane align done\n",
> > - encoder->base.base.id, encoder->base.name);
> > + lt_dbg(intel_dp, DP_PHY_DPRX, "Interlane align done\n");
> > break;
> > }
> >
> > if (timeout) {
> > intel_dp_dump_link_status(intel_dp, DP_PHY_DPRX,
> > link_status);
> > - drm_err(&i915->drm,
> > - "[ENCODER:%d:%s] Interlane align timeout\n",
> > - encoder->base.base.id, encoder->base.name);
> > + lt_err(intel_dp, DP_PHY_DPRX, "Interlane align
> > timeout\n");
> > return false;
> > }
> >
> > @@ -1322,16 +1248,12 @@ intel_dp_128b132b_lane_cds(struct intel_dp
> > *intel_dp,
> > const struct intel_crtc_state *crtc_state,
> > 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];
> > unsigned long deadline;
> >
> > if (drm_dp_dpcd_writeb(&intel_dp->aux, DP_TRAINING_PATTERN_SET,
> > DP_TRAINING_PATTERN_2_CDS) != 1) {
> > - drm_err(&i915->drm,
> > - "[ENCODER:%d:%s] Failed to start 128b/132b TPS2 CDS\n",
> > - encoder->base.base.id, encoder->base.name);
> > + lt_err(intel_dp, DP_PHY_DPRX, "Failed to start 128b/132b TPS2
> > CDS\n");
> > return false;
> > }
> >
> > @@ -1347,34 +1269,26 @@ intel_dp_128b132b_lane_cds(struct intel_dp
> > *intel_dp,
> > usleep_range(2000, 3000);
> >
> > if (drm_dp_dpcd_read_link_status(&intel_dp->aux, link_status) <
> > 0) {
> > - drm_err(&i915->drm,
> > - "[ENCODER:%d:%s] Failed to read link status\n",
> > - encoder->base.base.id, encoder->base.name);
> > + lt_err(intel_dp, DP_PHY_DPRX, "Failed to read link
> > status\n");
> > return false;
> > }
> >
> > if (drm_dp_128b132b_eq_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_dbg_kms(&i915->drm,
> > - "[ENCODER:%d:%s] CDS interlane align
> > done\n",
> > - encoder->base.base.id, encoder->base.name);
> > + lt_err(intel_dp, DP_PHY_DPRX, "CDS interlane align
> > done\n");
> > break;
> > }
> >
> > if (drm_dp_128b132b_link_training_failed(link_status)) {
> > intel_dp_dump_link_status(intel_dp, DP_PHY_DPRX,
> > link_status);
> > - drm_err(&i915->drm,
> > - "[ENCODER:%d:%s] Downstream link training
> > failure\n",
> > - encoder->base.base.id, encoder->base.name);
> > + lt_err(intel_dp, DP_PHY_DPRX, "Downstream link training
> > failure\n");
> > return false;
> > }
> >
> > if (timeout) {
> > intel_dp_dump_link_status(intel_dp, DP_PHY_DPRX,
> > link_status);
> > - drm_err(&i915->drm,
> > - "[ENCODER:%d:%s] CDS timeout\n",
> > - encoder->base.base.id, encoder->base.name);
> > + lt_err(intel_dp, DP_PHY_DPRX, "CDS timeout\n");
> > return false;
> > }
> > }
> > @@ -1390,15 +1304,11 @@ intel_dp_128b132b_link_train(struct intel_dp
> > *intel_dp,
> > const struct intel_crtc_state *crtc_state,
> > 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;
> >
> > if (wait_for(intel_dp_128b132b_intra_hop(intel_dp, crtc_state) == 0,
> > 500)) {
> > - drm_err(&i915->drm,
> > - "[ENCODER:%d:%s] 128b/132b intra-hop not clear\n",
> > - encoder->base.base.id, encoder->base.name);
> > + lt_err(intel_dp, DP_PHY_DPRX, "128b/132b intra-hop not
> > clear\n");
> > return false;
> > }
> >
> > @@ -1406,10 +1316,8 @@ intel_dp_128b132b_link_train(struct intel_dp
> > *intel_dp,
> > intel_dp_128b132b_lane_cds(intel_dp, crtc_state, lttpr_count))
> > passed = true;
> >
> > - drm_dbg_kms(&i915->drm,
> > - "[CONNECTOR:%d:%s][ENCODER:%d:%s] 128b/132b Link Training
> > %s at link rate = %d, lane count = %d\n",
> > - connector->base.base.id, connector->base.name,
> > - encoder->base.base.id, encoder->base.name,
> > + lt_conn_dbg(connector, intel_dp, DP_PHY_DPRX,
> > + "128b/132b Link Training %s at link rate = %d, lane count =
> > %d\n",
> > passed ? "passed" : "failed",
> > crtc_state->port_clock, crtc_state->lane_count);
> >
> > @@ -1431,7 +1339,6 @@ void intel_dp_start_link_train(struct intel_dp
> > *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;
> >
> > /*
> > @@ -1464,10 +1371,7 @@ void intel_dp_start_link_train(struct intel_dp
> > *intel_dp,
> > * ignore_long_hpd flag can unset from the testcase.
> > */
> > if (!passed && i915->display.hotplug.ignore_long_hpd) {
> > - drm_dbg_kms(&i915->drm,
> > - "[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);
> > + lt_conn_dbg(connector, intel_dp, DP_PHY_DPRX, "Ignore the link
> > failure\n");
> > return;
> > }
> >
> > @@ -1478,8 +1382,6 @@ void intel_dp_start_link_train(struct intel_dp
> > *intel_dp,
> > void intel_dp_128b132b_sdp_crc16(struct intel_dp *intel_dp,
> > 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
> > * disable SDP CRC. This is applicable for Display version 13.
> > @@ -1492,5 +1394,5 @@ void intel_dp_128b132b_sdp_crc16(struct intel_dp
> > *intel_dp,
> > DP_SDP_ERROR_DETECTION_CONFIGURATION,
> > 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");
> > }
> > --
> > 2.37.2
>
> --
> Ville Syrjälä
> Intel
