Commit 9e986666 authored by Lyude Paul's avatar Lyude Paul

drm/dp: Pass drm_dp_aux to drm_dp_link_train_clock_recovery_delay()

So that we can start using drm_dbg_*() in
drm_dp_link_train_clock_recovery_delay().
Signed-off-by: default avatarLyude Paul <lyude@redhat.com>
Reviewed-by: default avatarLaurent Pinchart <laurent.pinchart@ideasonboard.com>
Reviewed-by: default avatarRodrigo Vivi <rodrigo.vivi@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20210423184309.207645-6-lyude@redhat.comReviewed-by: default avatarDave Airlie <airlied@redhat.com>
parent 3f3a6524
...@@ -612,7 +612,7 @@ amdgpu_atombios_dp_link_train_cr(struct amdgpu_atombios_dp_link_train_info *dp_i ...@@ -612,7 +612,7 @@ amdgpu_atombios_dp_link_train_cr(struct amdgpu_atombios_dp_link_train_info *dp_i
dp_info->tries = 0; dp_info->tries = 0;
voltage = 0xff; voltage = 0xff;
while (1) { while (1) {
drm_dp_link_train_clock_recovery_delay(dp_info->dpcd); drm_dp_link_train_clock_recovery_delay(dp_info->aux, dp_info->dpcd);
if (drm_dp_dpcd_read_link_status(dp_info->aux, if (drm_dp_dpcd_read_link_status(dp_info->aux,
dp_info->link_status) <= 0) { dp_info->link_status) <= 0) {
......
...@@ -132,7 +132,8 @@ u8 drm_dp_get_adjust_request_post_cursor(const u8 link_status[DP_LINK_STATUS_SIZ ...@@ -132,7 +132,8 @@ u8 drm_dp_get_adjust_request_post_cursor(const u8 link_status[DP_LINK_STATUS_SIZ
} }
EXPORT_SYMBOL(drm_dp_get_adjust_request_post_cursor); EXPORT_SYMBOL(drm_dp_get_adjust_request_post_cursor);
void drm_dp_link_train_clock_recovery_delay(const u8 dpcd[DP_RECEIVER_CAP_SIZE]) void drm_dp_link_train_clock_recovery_delay(const struct drm_dp_aux *aux,
const u8 dpcd[DP_RECEIVER_CAP_SIZE])
{ {
unsigned long rd_interval = dpcd[DP_TRAINING_AUX_RD_INTERVAL] & unsigned long rd_interval = dpcd[DP_TRAINING_AUX_RD_INTERVAL] &
DP_TRAINING_AUX_RD_MASK; DP_TRAINING_AUX_RD_MASK;
......
...@@ -513,7 +513,7 @@ static void intel_dp_link_training_clock_recovery_delay(struct intel_dp *intel_d ...@@ -513,7 +513,7 @@ static void intel_dp_link_training_clock_recovery_delay(struct intel_dp *intel_d
enum drm_dp_phy dp_phy) enum drm_dp_phy dp_phy)
{ {
if (dp_phy == DP_PHY_DPRX) if (dp_phy == DP_PHY_DPRX)
drm_dp_link_train_clock_recovery_delay(intel_dp->dpcd); drm_dp_link_train_clock_recovery_delay(&intel_dp->aux, intel_dp->dpcd);
else else
drm_dp_lttpr_link_train_clock_recovery_delay(); drm_dp_lttpr_link_train_clock_recovery_delay();
} }
......
...@@ -1103,7 +1103,7 @@ static int dp_ctrl_link_train_1(struct dp_ctrl_private *ctrl, ...@@ -1103,7 +1103,7 @@ static int dp_ctrl_link_train_1(struct dp_ctrl_private *ctrl,
tries = 0; tries = 0;
old_v_level = ctrl->link->phy_params.v_level; old_v_level = ctrl->link->phy_params.v_level;
for (tries = 0; tries < maximum_retries; tries++) { for (tries = 0; tries < maximum_retries; tries++) {
drm_dp_link_train_clock_recovery_delay(ctrl->panel->dpcd); drm_dp_link_train_clock_recovery_delay(ctrl->aux, ctrl->panel->dpcd);
ret = dp_ctrl_read_link_status(ctrl, link_status); ret = dp_ctrl_read_link_status(ctrl, link_status);
if (ret) if (ret)
......
...@@ -608,7 +608,7 @@ static int edp_start_link_train_1(struct edp_ctrl *ctrl) ...@@ -608,7 +608,7 @@ static int edp_start_link_train_1(struct edp_ctrl *ctrl)
tries = 0; tries = 0;
old_v_level = ctrl->v_level; old_v_level = ctrl->v_level;
while (1) { while (1) {
drm_dp_link_train_clock_recovery_delay(ctrl->dpcd); drm_dp_link_train_clock_recovery_delay(ctrl->drm_aux, ctrl->dpcd);
rlen = drm_dp_dpcd_read_link_status(ctrl->drm_aux, link_status); rlen = drm_dp_dpcd_read_link_status(ctrl->drm_aux, link_status);
if (rlen < DP_LINK_STATUS_SIZE) { if (rlen < DP_LINK_STATUS_SIZE) {
......
...@@ -680,7 +680,7 @@ static int radeon_dp_link_train_cr(struct radeon_dp_link_train_info *dp_info) ...@@ -680,7 +680,7 @@ static int radeon_dp_link_train_cr(struct radeon_dp_link_train_info *dp_info)
dp_info->tries = 0; dp_info->tries = 0;
voltage = 0xff; voltage = 0xff;
while (1) { while (1) {
drm_dp_link_train_clock_recovery_delay(dp_info->dpcd); drm_dp_link_train_clock_recovery_delay(dp_info->aux, dp_info->dpcd);
if (drm_dp_dpcd_read_link_status(dp_info->aux, if (drm_dp_dpcd_read_link_status(dp_info->aux,
dp_info->link_status) <= 0) { dp_info->link_status) <= 0) {
......
...@@ -713,7 +713,7 @@ static int zynqmp_dp_link_train_cr(struct zynqmp_dp *dp) ...@@ -713,7 +713,7 @@ static int zynqmp_dp_link_train_cr(struct zynqmp_dp *dp)
if (ret) if (ret)
return ret; return ret;
drm_dp_link_train_clock_recovery_delay(dp->dpcd); drm_dp_link_train_clock_recovery_delay(&dp->aux, dp->dpcd);
ret = drm_dp_dpcd_read_link_status(&dp->aux, link_status); ret = drm_dp_dpcd_read_link_status(&dp->aux, link_status);
if (ret < 0) if (ret < 0)
return ret; return ret;
......
...@@ -29,6 +29,7 @@ ...@@ -29,6 +29,7 @@
#include <drm/drm_connector.h> #include <drm/drm_connector.h>
struct drm_device; struct drm_device;
struct drm_dp_aux;
/* /*
* Unless otherwise noted, all values are from the DP 1.1a spec. Note that * Unless otherwise noted, all values are from the DP 1.1a spec. Note that
...@@ -1482,7 +1483,8 @@ u8 drm_dp_get_adjust_request_post_cursor(const u8 link_status[DP_LINK_STATUS_SIZ ...@@ -1482,7 +1483,8 @@ u8 drm_dp_get_adjust_request_post_cursor(const u8 link_status[DP_LINK_STATUS_SIZ
#define DP_LTTPR_COMMON_CAP_SIZE 8 #define DP_LTTPR_COMMON_CAP_SIZE 8
#define DP_LTTPR_PHY_CAP_SIZE 3 #define DP_LTTPR_PHY_CAP_SIZE 3
void drm_dp_link_train_clock_recovery_delay(const u8 dpcd[DP_RECEIVER_CAP_SIZE]); void drm_dp_link_train_clock_recovery_delay(const struct drm_dp_aux *aux,
const u8 dpcd[DP_RECEIVER_CAP_SIZE]);
void drm_dp_lttpr_link_train_clock_recovery_delay(void); void drm_dp_lttpr_link_train_clock_recovery_delay(void);
void drm_dp_link_train_channel_eq_delay(const u8 dpcd[DP_RECEIVER_CAP_SIZE]); void drm_dp_link_train_channel_eq_delay(const u8 dpcd[DP_RECEIVER_CAP_SIZE]);
void drm_dp_lttpr_link_train_channel_eq_delay(const u8 caps[DP_LTTPR_PHY_CAP_SIZE]); void drm_dp_lttpr_link_train_channel_eq_delay(const u8 caps[DP_LTTPR_PHY_CAP_SIZE]);
......
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