mirrors/linux
2
0
Fork 0
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git synced 2026-07-22 02:17:36 -04:00
Code Issues Packages Projects Releases Wiki Activity

drm/bridge: analogix_dp: Apply DP helper APIs to get adjusted voltages and pre-emphasises

Browse Source 
Replace analogix_dp_get_adjust_request_voltage() and
analogix_dp_get_adjust_request_pre_emphasis() with existing DP helper
APIs with the same function.

Signed-off-by: Damon Ding <damon.ding@rock-chips.com>
Tested-by: Marek Szyprowski <m.szyprowski@samsung.com>
Reviewed-by: Dmitry Baryshkov <dmitry.baryshkov@oss.qualcomm.com>
Reviewed-by: Luca Ceresoli <luca.ceresoli@bootlin.com>
Link: https://patch.msgid.link/20251110085823.1197472-5-damon.ding@rock-chips.com
Signed-off-by: Luca Ceresoli <luca.ceresoli@bootlin.com>
This commit is contained in:
Damon Ding
2025-11-10 16:58:23 +08:00
committed by Luca Ceresoli
parent 51eb548ade
commit d84b087c76
1 changed files with 9 additions and 40 deletions
Download Patch File Download Diff File Expand all files Collapse all files

49
drivers/gpu/drm/bridge/analogix/analogix_dp_core.c
View File

@@ -289,25 +289,6 @@ static int analogix_dp_link_start(struct analogix_dp_device *dp)
return 0;
}
static unsigned char
analogix_dp_get_adjust_request_voltage(u8 adjust_request[2], int lane)
{
int shift = (lane & 1) * 4;
u8 link_value = adjust_request[lane >> 1];
return (link_value >> shift) & 0x3;
}
static unsigned char analogix_dp_get_adjust_request_pre_emphasis(
u8 adjust_request[2],
int lane)
{
int shift = (lane & 1) * 4;
u8 link_value = adjust_request[lane >> 1];
return ((link_value >> shift) & 0xc) >> 2;
}
static void analogix_dp_reduce_link_rate(struct analogix_dp_device *dp)
{
analogix_dp_training_pattern_dis(dp);
@@ -317,17 +298,15 @@ static void analogix_dp_reduce_link_rate(struct analogix_dp_device *dp)
}
static void analogix_dp_get_adjust_training_lane(struct analogix_dp_device *dp,
u8 adjust_request[2])
u8 link_status[DP_LINK_STATUS_SIZE])
{
int lane, lane_count;
u8 voltage_swing, pre_emphasis, training_lane;
lane_count = dp->link_train.lane_count;
for (lane = 0; lane < lane_count; lane++) {
voltage_swing = analogix_dp_get_adjust_request_voltage(
adjust_request, lane);
pre_emphasis = analogix_dp_get_adjust_request_pre_emphasis(
adjust_request, lane);
voltage_swing = drm_dp_get_adjust_request_voltage(link_status, lane);
pre_emphasis = drm_dp_get_adjust_request_pre_emphasis(link_status, lane);
training_lane = DPCD_VOLTAGE_SWING_SET(voltage_swing) |
DPCD_PRE_EMPHASIS_SET(pre_emphasis);
@@ -344,7 +323,7 @@ static int analogix_dp_process_clock_recovery(struct analogix_dp_device *dp)
{
int lane, lane_count, retval;
u8 voltage_swing, pre_emphasis, training_lane;
u8 link_status[DP_LINK_STATUS_SIZE], adjust_request[2];
u8 link_status[DP_LINK_STATUS_SIZE];
usleep_range(100, 101);
@@ -370,15 +349,10 @@ static int analogix_dp_process_clock_recovery(struct analogix_dp_device *dp)
return 0;
}
retval = drm_dp_dpcd_read(&dp->aux, DP_ADJUST_REQUEST_LANE0_1,
adjust_request, 2);
if (retval < 0)
return retval;
for (lane = 0; lane < lane_count; lane++) {
training_lane = analogix_dp_get_lane_link_training(dp, lane);
voltage_swing = analogix_dp_get_adjust_request_voltage(adjust_request, lane);
pre_emphasis = analogix_dp_get_adjust_request_pre_emphasis(adjust_request, lane);
voltage_swing = drm_dp_get_adjust_request_voltage(link_status, lane);
pre_emphasis = drm_dp_get_adjust_request_pre_emphasis(link_status, lane);
if (DPCD_VOLTAGE_SWING_GET(training_lane) == voltage_swing &&
DPCD_PRE_EMPHASIS_GET(training_lane) == pre_emphasis)
@@ -395,7 +369,7 @@ static int analogix_dp_process_clock_recovery(struct analogix_dp_device *dp)
}
}
analogix_dp_get_adjust_training_lane(dp, adjust_request);
analogix_dp_get_adjust_training_lane(dp, link_status);
analogix_dp_set_lane_link_training(dp);
retval = drm_dp_dpcd_write(&dp->aux, DP_TRAINING_LANE0_SET,
@@ -410,7 +384,7 @@ static int analogix_dp_process_equalizer_training(struct analogix_dp_device *dp)
{
int lane_count, retval;
u32 reg;
u8 link_status[DP_LINK_STATUS_SIZE], adjust_request[2];
u8 link_status[DP_LINK_STATUS_SIZE];
usleep_range(400, 401);
@@ -425,12 +399,7 @@ static int analogix_dp_process_equalizer_training(struct analogix_dp_device *dp)
return -EIO;
}
retval = drm_dp_dpcd_read(&dp->aux, DP_ADJUST_REQUEST_LANE0_1,
adjust_request, 2);
if (retval < 0)
return retval;
analogix_dp_get_adjust_training_lane(dp, adjust_request);
analogix_dp_get_adjust_training_lane(dp, link_status);
if (drm_dp_channel_eq_ok(link_status, lane_count)) {
/* traing pattern Set to Normal */