Skip to content

R
raspberrypi-kernel

openeuler / raspberrypi-kernel

通知 13
Star 1
Fork 0
R
raspberrypi-kernel
提交 fadec4b7 编写于 作者: S Sean Paul 提交者： Jingoo Han
浏览文件
操作

video: exynos_dp: Clean up SW link training 

Clean up some of the SW training code to make it more clear and reduce
duplicate code.

[jg1.han@samsung.com: used exynos_dp_write_bytes_to_dpcd()]
Signed-off-by: NSean Paul <seanpaul@chromium.org>
Signed-off-by: NJingoo Han <jg1.han@samsung.com>
上级 ace2d7f2
显示空白变更内容
内联 并排
Showing with 119 addition and 173 deletion
drivers/video/exynos/exynos_dp_core.c
浏览文件 @ fadec4b7
...@@ -302,16 +302,17 @@ static int exynos_dp_link_start(struct exynos_dp_device *dp) ...@@ -302,16 +302,17 @@ static int exynos_dp_link_start(struct exynos_dp_device *dp)
exynos_dp_set_training_pattern(dp, TRAINING_PTN1); exynos_dp_set_training_pattern(dp, TRAINING_PTN1);
/* Set RX training pattern */ /* Set RX training pattern */
exynos_dp_write_byte_to_dpcd(dp, retval = exynos_dp_write_byte_to_dpcd(dp,
DPCD_ADDR_TRAINING_PATTERN_SET, DPCD_ADDR_TRAINING_PATTERN_SET,
DPCD_SCRAMBLING_DISABLED | DPCD_SCRAMBLING_DISABLED | DPCD_TRAINING_PATTERN_1);
DPCD_TRAINING_PATTERN_1); if (retval)
return retval;
for (lane = 0; lane < lane_count; lane++) for (lane = 0; lane < lane_count; lane++)
buf[lane] = DPCD_PRE_EMPHASIS_PATTERN2_LEVEL0 | buf[lane] = DPCD_PRE_EMPHASIS_PATTERN2_LEVEL0 |
DPCD_VOLTAGE_SWING_PATTERN1_LEVEL0; DPCD_VOLTAGE_SWING_PATTERN1_LEVEL0;
retval = exynos_dp_write_bytes_to_dpcd(dp,
DPCD_ADDR_TRAINING_LANE0_SET, retval = exynos_dp_write_bytes_to_dpcd(dp, DPCD_ADDR_TRAINING_LANE0_SET,
lane_count, buf); lane_count, buf);
return retval; return retval;
...@@ -338,18 +339,17 @@ static int exynos_dp_clock_recovery_ok(u8 link_status[2], int lane_count) ...@@ -338,18 +339,17 @@ static int exynos_dp_clock_recovery_ok(u8 link_status[2], int lane_count)
return 0; return 0;
} }
static int exynos_dp_channel_eq_ok(u8 link_align[3], int lane_count) static int exynos_dp_channel_eq_ok(u8 link_status[2], u8 link_align,
int lane_count)
{ {
int lane; int lane;
u8 lane_align;
u8 lane_status; u8 lane_status;
lane_align = link_align[2]; if ((link_align & DPCD_INTERLANE_ALIGN_DONE) == 0)
if ((lane_align & DPCD_INTERLANE_ALIGN_DONE) == 0)
return -EINVAL; return -EINVAL;
for (lane = 0; lane < lane_count; lane++) { for (lane = 0; lane < lane_count; lane++) {
lane_status = exynos_dp_get_lane_status(link_align, lane); lane_status = exynos_dp_get_lane_status(link_status, lane);
lane_status &= DPCD_CHANNEL_EQ_BITS; lane_status &= DPCD_CHANNEL_EQ_BITS;
if (lane_status != DPCD_CHANNEL_EQ_BITS) if (lane_status != DPCD_CHANNEL_EQ_BITS)
return -EINVAL; return -EINVAL;
...@@ -433,36 +433,14 @@ static void exynos_dp_reduce_link_rate(struct exynos_dp_device *dp) ...@@ -433,36 +433,14 @@ static void exynos_dp_reduce_link_rate(struct exynos_dp_device *dp)
dp->link_train.lt_state = FAILED; dp->link_train.lt_state = FAILED;
} }
static int exynos_dp_process_clock_recovery(struct exynos_dp_device *dp) static void exynos_dp_get_adjust_training_lane(struct exynos_dp_device *dp,
u8 adjust_request[2])
{ {
u8 link_status[2]; int lane, lane_count;
int lane, lane_count, retval; u8 voltage_swing, pre_emphasis, training_lane;
u8 adjust_request[2];
u8 voltage_swing;
u8 pre_emphasis;
u8 training_lane;
usleep_range(100, 101);
lane_count = dp->link_train.lane_count; lane_count = dp->link_train.lane_count;
retval = exynos_dp_read_bytes_from_dpcd(dp, DPCD_ADDR_LANE0_1_STATUS,
2, link_status);
if (retval)
return retval;
if (exynos_dp_clock_recovery_ok(link_status, lane_count) == 0) {
/* set training pattern 2 for EQ */
exynos_dp_set_training_pattern(dp, TRAINING_PTN2);
for (lane = 0; lane < lane_count; lane++) { for (lane = 0; lane < lane_count; lane++) {
retval = exynos_dp_read_bytes_from_dpcd(dp,
DPCD_ADDR_ADJUST_REQUEST_LANE0_1,
2, adjust_request);
if (retval)
return retval;
voltage_swing = exynos_dp_get_adjust_request_voltage( voltage_swing = exynos_dp_get_adjust_request_voltage(
adjust_request, lane); adjust_request, lane);
pre_emphasis = exynos_dp_get_adjust_request_pre_emphasis( pre_emphasis = exynos_dp_get_adjust_request_pre_emphasis(
...@@ -476,11 +454,32 @@ static int exynos_dp_process_clock_recovery(struct exynos_dp_device *dp) ...@@ -476,11 +454,32 @@ static int exynos_dp_process_clock_recovery(struct exynos_dp_device *dp)
training_lane |= DPCD_MAX_PRE_EMPHASIS_REACHED; training_lane |= DPCD_MAX_PRE_EMPHASIS_REACHED;
dp->link_train.training_lane[lane] = training_lane; dp->link_train.training_lane[lane] = training_lane;
exynos_dp_set_lane_link_training(dp,
dp->link_train.training_lane[lane],
lane);
} }
}
static int exynos_dp_process_clock_recovery(struct exynos_dp_device *dp)
{
int lane, lane_count, retval;
u8 voltage_swing, pre_emphasis, training_lane;
u8 link_status[2], adjust_request[2];
usleep_range(100, 101);
lane_count = dp->link_train.lane_count;
retval = exynos_dp_read_bytes_from_dpcd(dp,
DPCD_ADDR_LANE0_1_STATUS, 2, link_status);
if (retval)
return retval;
retval = exynos_dp_read_bytes_from_dpcd(dp,
DPCD_ADDR_ADJUST_REQUEST_LANE0_1, 2, adjust_request);
if (retval)
return retval;
if (exynos_dp_clock_recovery_ok(link_status, lane_count) == 0) {
/* set training pattern 2 for EQ */
exynos_dp_set_training_pattern(dp, TRAINING_PTN2);
retval = exynos_dp_write_byte_to_dpcd(dp, retval = exynos_dp_write_byte_to_dpcd(dp,
DPCD_ADDR_TRAINING_PATTERN_SET, DPCD_ADDR_TRAINING_PATTERN_SET,
...@@ -489,127 +488,83 @@ static int exynos_dp_process_clock_recovery(struct exynos_dp_device *dp) ...@@ -489,127 +488,83 @@ static int exynos_dp_process_clock_recovery(struct exynos_dp_device *dp)
if (retval) if (retval)
return retval; return retval;
retval = exynos_dp_write_bytes_to_dpcd(dp,
DPCD_ADDR_TRAINING_LANE0_SET,
lane_count,
dp->link_train.training_lane);
if (retval)
return retval;
dev_info(dp->dev, "Link Training Clock Recovery success\n"); dev_info(dp->dev, "Link Training Clock Recovery success\n");
dp->link_train.lt_state = EQUALIZER_TRAINING; dp->link_train.lt_state = EQUALIZER_TRAINING;
} else { } else {
for (lane = 0; lane < lane_count; lane++) { for (lane = 0; lane < lane_count; lane++) {
training_lane = exynos_dp_get_lane_link_training( training_lane = exynos_dp_get_lane_link_training(
dp, lane); dp, lane);
retval = exynos_dp_read_bytes_from_dpcd(dp,
DPCD_ADDR_ADJUST_REQUEST_LANE0_1,
2, adjust_request);
if (retval)
return retval;
voltage_swing = exynos_dp_get_adjust_request_voltage( voltage_swing = exynos_dp_get_adjust_request_voltage(
adjust_request, lane); adjust_request, lane);
pre_emphasis = exynos_dp_get_adjust_request_pre_emphasis( pre_emphasis = exynos_dp_get_adjust_request_pre_emphasis(
adjust_request, lane); adjust_request, lane);
if (voltage_swing == VOLTAGE_LEVEL_3 || if (DPCD_VOLTAGE_SWING_GET(training_lane) ==
voltage_swing &&
DPCD_PRE_EMPHASIS_GET(training_lane) ==
pre_emphasis)
dp->link_train.cr_loop[lane]++;
if (dp->link_train.cr_loop[lane] == MAX_CR_LOOP ||
voltage_swing == VOLTAGE_LEVEL_3 ||
pre_emphasis == PRE_EMPHASIS_LEVEL_3) { pre_emphasis == PRE_EMPHASIS_LEVEL_3) {
dev_err(dp->dev, "voltage or pre emphasis reached max level\n"); dev_err(dp->dev, "CR Max reached (%d,%d,%d)\n",
goto reduce_link_rate; dp->link_train.cr_loop[lane],
voltage_swing, pre_emphasis);
exynos_dp_reduce_link_rate(dp);
return -EIO;
} }
if ((DPCD_VOLTAGE_SWING_GET(training_lane) ==
voltage_swing) &&
(DPCD_PRE_EMPHASIS_GET(training_lane) ==
pre_emphasis)) {
dp->link_train.cr_loop[lane]++;
if (dp->link_train.cr_loop[lane] == MAX_CR_LOOP) {
dev_err(dp->dev, "CR Max loop\n");
goto reduce_link_rate;
} }
} }
training_lane = DPCD_VOLTAGE_SWING_SET(voltage_swing) | exynos_dp_get_adjust_training_lane(dp, adjust_request);
DPCD_PRE_EMPHASIS_SET(pre_emphasis);
if (voltage_swing == VOLTAGE_LEVEL_3)
training_lane |= DPCD_MAX_SWING_REACHED;
if (pre_emphasis == PRE_EMPHASIS_LEVEL_3)
training_lane |= DPCD_MAX_PRE_EMPHASIS_REACHED;
dp->link_train.training_lane[lane] = training_lane;
for (lane = 0; lane < lane_count; lane++)
exynos_dp_set_lane_link_training(dp, exynos_dp_set_lane_link_training(dp,
dp->link_train.training_lane[lane], lane); dp->link_train.training_lane[lane], lane);
}
retval = exynos_dp_write_bytes_to_dpcd(dp, retval = exynos_dp_write_bytes_to_dpcd(dp,
DPCD_ADDR_TRAINING_LANE0_SET, lane_count, DPCD_ADDR_TRAINING_LANE0_SET, lane_count,
dp->link_train.training_lane); dp->link_train.training_lane);
if (retval) if (retval)
return retval; return retval;
}
return retval; return retval;
reduce_link_rate:
exynos_dp_reduce_link_rate(dp);
return -EIO;
} }
static int exynos_dp_process_equalizer_training(struct exynos_dp_device *dp) static int exynos_dp_process_equalizer_training(struct exynos_dp_device *dp)
{ {
u8 link_status[2];
u8 link_align[3];
int lane, lane_count, retval; int lane, lane_count, retval;
u32 reg; u32 reg;
u8 link_align, link_status[2], adjust_request[2];
u8 adjust_request[2];
u8 voltage_swing;
u8 pre_emphasis;
u8 training_lane;
usleep_range(400, 401); usleep_range(400, 401);
lane_count = dp->link_train.lane_count; lane_count = dp->link_train.lane_count;
retval = exynos_dp_read_bytes_from_dpcd(dp, DPCD_ADDR_LANE0_1_STATUS, retval = exynos_dp_read_bytes_from_dpcd(dp,
2, link_status); DPCD_ADDR_LANE0_1_STATUS, 2, link_status);
if (retval) if (retval)
return retval; return retval;
if (exynos_dp_clock_recovery_ok(link_status, lane_count) == 0) { if (exynos_dp_clock_recovery_ok(link_status, lane_count)) {
link_align[0] = link_status[0]; exynos_dp_reduce_link_rate(dp);
link_align[1] = link_status[1]; return -EIO;
}
exynos_dp_read_byte_from_dpcd(dp,
DPCD_ADDR_LANE_ALIGN_STATUS_UPDATED,
&link_align[2]);
for (lane = 0; lane < lane_count; lane++) {
retval = exynos_dp_read_bytes_from_dpcd(dp, retval = exynos_dp_read_bytes_from_dpcd(dp,
DPCD_ADDR_ADJUST_REQUEST_LANE0_1, DPCD_ADDR_ADJUST_REQUEST_LANE0_1, 2, adjust_request);
2, adjust_request);
if (retval) if (retval)
return retval; return retval;
voltage_swing = exynos_dp_get_adjust_request_voltage( retval = exynos_dp_read_byte_from_dpcd(dp,
adjust_request, lane); DPCD_ADDR_LANE_ALIGN_STATUS_UPDATED, &link_align);
pre_emphasis = exynos_dp_get_adjust_request_pre_emphasis( if (retval)
adjust_request, lane); return retval;
training_lane = DPCD_VOLTAGE_SWING_SET(voltage_swing) |
DPCD_PRE_EMPHASIS_SET(pre_emphasis);
if (voltage_swing == VOLTAGE_LEVEL_3) exynos_dp_get_adjust_training_lane(dp, adjust_request);
training_lane |= DPCD_MAX_SWING_REACHED;
if (pre_emphasis == PRE_EMPHASIS_LEVEL_3)
training_lane |= DPCD_MAX_PRE_EMPHASIS_REACHED;
dp->link_train.training_lane[lane] = training_lane; if (!exynos_dp_channel_eq_ok(link_status, link_align, lane_count)) {
}
if (exynos_dp_channel_eq_ok(link_align, lane_count) == 0) {
/* traing pattern Set to Normal */ /* traing pattern Set to Normal */
exynos_dp_training_pattern_dis(dp); exynos_dp_training_pattern_dis(dp);
...@@ -628,36 +583,27 @@ static int exynos_dp_process_equalizer_training(struct exynos_dp_device *dp) ...@@ -628,36 +583,27 @@ static int exynos_dp_process_equalizer_training(struct exynos_dp_device *dp)
/* set enhanced mode if available */ /* set enhanced mode if available */
exynos_dp_set_enhanced_mode(dp); exynos_dp_set_enhanced_mode(dp);
dp->link_train.lt_state = FINISHED; dp->link_train.lt_state = FINISHED;
} else {
return 0;
}
/* not all locked */ /* not all locked */
dp->link_train.eq_loop++; dp->link_train.eq_loop++;
if (dp->link_train.eq_loop > MAX_EQ_LOOP) { if (dp->link_train.eq_loop > MAX_EQ_LOOP) {
dev_err(dp->dev, "EQ Max loop\n"); dev_err(dp->dev, "EQ Max loop\n");
goto reduce_link_rate; exynos_dp_reduce_link_rate(dp);
return -EIO;
} }
for (lane = 0; lane < lane_count; lane++) for (lane = 0; lane < lane_count; lane++)
exynos_dp_set_lane_link_training(dp, exynos_dp_set_lane_link_training(dp,
dp->link_train.training_lane[lane], dp->link_train.training_lane[lane], lane);
lane);
retval = exynos_dp_write_bytes_to_dpcd(dp,
DPCD_ADDR_TRAINING_LANE0_SET,
lane_count,
dp->link_train.training_lane);
if (retval)
return retval;
}
} else {
goto reduce_link_rate;
}
return 0; retval = exynos_dp_write_bytes_to_dpcd(dp, DPCD_ADDR_TRAINING_LANE0_SET,
lane_count, dp->link_train.training_lane);
reduce_link_rate: return retval;
exynos_dp_reduce_link_rate(dp);
return -EIO;
} }
static void exynos_dp_get_max_rx_bandwidth(struct exynos_dp_device *dp, static void exynos_dp_get_max_rx_bandwidth(struct exynos_dp_device *dp,
......
Markdown is supported
0% 或 .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑！
想要评论请 注册 或