Merge tag 'drm-msm-next-2021-06-23b' of https://gitlab.freedesktop.org/drm/msm into...

[linux-2.6-microblaze.git] / drivers / gpu / drm / msm / dp / dp_ctrl.c

diff --git a/drivers/gpu/drm/msm/dp/dp_ctrl.c b/drivers/gpu/drm/msm/dp/dp_ctrl.c
index c25ffcd..ee221d8 100644 (file)
--- a/drivers/gpu/drm/msm/dp/dp_ctrl.c
+++ b/drivers/gpu/drm/msm/dp/dp_ctrl.c
@@ -1101,7 +1101,7 @@ static int dp_ctrl_link_train_1(struct dp_ctrl_private *ctrl,
        tries = 0;
        old_v_level = ctrl->link->phy_params.v_level;
        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);
                if (ret)
@@ -1182,7 +1182,7 @@ static int dp_ctrl_link_lane_down_shift(struct dp_ctrl_private *ctrl)
 static void dp_ctrl_clear_training_pattern(struct dp_ctrl_private *ctrl)
 {
        dp_ctrl_train_pattern_set(ctrl, DP_TRAINING_PATTERN_DISABLE);
-       drm_dp_link_train_channel_eq_delay(ctrl->panel->dpcd);
+       drm_dp_link_train_channel_eq_delay(ctrl->aux, ctrl->panel->dpcd);
 }
 
 static int dp_ctrl_link_train_2(struct dp_ctrl_private *ctrl,
@@ -1213,7 +1213,7 @@ static int dp_ctrl_link_train_2(struct dp_ctrl_private *ctrl,
        dp_ctrl_train_pattern_set(ctrl, pattern | DP_RECOVERED_CLOCK_OUT_EN);
 
        for (tries = 0; tries <= maximum_retries; tries++) {
-               drm_dp_link_train_channel_eq_delay(ctrl->panel->dpcd);
+               drm_dp_link_train_channel_eq_delay(ctrl->aux, ctrl->panel->dpcd);
 
                ret = dp_ctrl_read_link_status(ctrl, link_status);
                if (ret)