Commit 427e59d3 authored by Lyude Paul's avatar Lyude Paul

drm/dp: Always print aux channel name in logs

Since we're about to convert everything in drm_dp_helper.c over to using
drm_dbg_*(), let's also make our logging more consistent in drm_dp_helper.c
while we're at it to ensure that we always print the name of the AUX
channel in question.
Signed-off-by: default avatarLyude Paul <lyude@redhat.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20210423184309.207645-8-lyude@redhat.comReviewed-by: default avatarDave Airlie <airlied@redhat.com>
parent 0c4fada6
...@@ -139,8 +139,8 @@ void drm_dp_link_train_clock_recovery_delay(const struct drm_dp_aux *aux, ...@@ -139,8 +139,8 @@ void drm_dp_link_train_clock_recovery_delay(const struct drm_dp_aux *aux,
DP_TRAINING_AUX_RD_MASK; DP_TRAINING_AUX_RD_MASK;
if (rd_interval > 4) if (rd_interval > 4)
DRM_DEBUG_KMS("AUX interval %lu, out of range (max 4)\n", DRM_DEBUG_KMS("%s: AUX interval %lu, out of range (max 4)\n",
rd_interval); aux->name, rd_interval);
if (rd_interval == 0 || dpcd[DP_DPCD_REV] >= DP_DPCD_REV_14) if (rd_interval == 0 || dpcd[DP_DPCD_REV] >= DP_DPCD_REV_14)
rd_interval = 100; rd_interval = 100;
...@@ -155,8 +155,8 @@ static void __drm_dp_link_train_channel_eq_delay(const struct drm_dp_aux *aux, ...@@ -155,8 +155,8 @@ static void __drm_dp_link_train_channel_eq_delay(const struct drm_dp_aux *aux,
unsigned long rd_interval) unsigned long rd_interval)
{ {
if (rd_interval > 4) if (rd_interval > 4)
DRM_DEBUG_KMS("AUX interval %lu, out of range (max 4)\n", DRM_DEBUG_KMS("%s: AUX interval %lu, out of range (max 4)\n",
rd_interval); aux->name, rd_interval);
if (rd_interval == 0) if (rd_interval == 0)
rd_interval = 400; rd_interval = 400;
...@@ -2781,7 +2781,7 @@ int drm_dp_pcon_frl_enable(struct drm_dp_aux *aux) ...@@ -2781,7 +2781,7 @@ int drm_dp_pcon_frl_enable(struct drm_dp_aux *aux)
if (ret < 0) if (ret < 0)
return ret; return ret;
if (!(buf & DP_PCON_ENABLE_SOURCE_CTL_MODE)) { if (!(buf & DP_PCON_ENABLE_SOURCE_CTL_MODE)) {
DRM_DEBUG_KMS("PCON in Autonomous mode, can't enable FRL\n"); DRM_DEBUG_KMS("%s: PCON in Autonomous mode, can't enable FRL\n", aux->name);
return -EINVAL; return -EINVAL;
} }
buf |= DP_PCON_ENABLE_HDMI_LINK; buf |= DP_PCON_ENABLE_HDMI_LINK;
...@@ -2876,7 +2876,8 @@ void drm_dp_pcon_hdmi_frl_link_error_count(struct drm_dp_aux *aux, ...@@ -2876,7 +2876,8 @@ void drm_dp_pcon_hdmi_frl_link_error_count(struct drm_dp_aux *aux,
num_error = 0; num_error = 0;
} }
DRM_ERROR("More than %d errors since the last read for lane %d", num_error, i); DRM_ERROR("%s: More than %d errors since the last read for lane %d",
aux->name, num_error, i);
} }
} }
EXPORT_SYMBOL(drm_dp_pcon_hdmi_frl_link_error_count); EXPORT_SYMBOL(drm_dp_pcon_hdmi_frl_link_error_count);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment