From: Damon Ding <damon.ding@rock-chips.com>
To: andrzej.hajda@intel.com, neil.armstrong@linaro.org, rfoss@kernel.org
Cc: Laurent.pinchart@ideasonboard.com, jonas@kwiboo.se,
jernej.skrabec@gmail.com, maarten.lankhorst@linux.intel.com,
mripard@kernel.org, tzimmermann@suse.de, airlied@gmail.com,
simona@ffwll.ch, dmitry.baryshkov@oss.qualcomm.com,
dianders@chromium.org, m.szyprowski@samsung.com,
andy.yan@rock-chips.com, dri-devel@lists.freedesktop.org,
linux-kernel@vger.kernel.org,
Damon Ding <damon.ding@rock-chips.com>
Subject: [PATCH v1 4/4] drm/bridge: analogix_dp: Apply DP helper APIs to get adjusted voltages and pre-emphasises
Date: Sun, 24 Aug 2025 16:45:29 +0800 [thread overview]
Message-ID: <20250824084529.3317985-5-damon.ding@rock-chips.com> (raw)
In-Reply-To: <20250824084529.3317985-1-damon.ding@rock-chips.com>
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>
---
.../drm/bridge/analogix/analogix_dp_core.c | 49 ++++---------------
1 file changed, 9 insertions(+), 40 deletions(-)
diff --git a/drivers/gpu/drm/bridge/analogix/analogix_dp_core.c b/drivers/gpu/drm/bridge/analogix/analogix_dp_core.c
index 1f1de45ca46f..a6d4935234c2 100644
--- a/drivers/gpu/drm/bridge/analogix/analogix_dp_core.c
+++ b/drivers/gpu/drm/bridge/analogix/analogix_dp_core.c
@@ -293,25 +293,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);
@@ -321,17 +302,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);
@@ -348,7 +327,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);
@@ -374,15 +353,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)
@@ -399,7 +373,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,
@@ -414,7 +388,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);
@@ -429,12 +403,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 */
--
2.34.1
next prev parent reply other threads:[~2025-08-24 9:21 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
[not found] <CGME20250824084543eucas1p10fcc1e6656f3cc3909d457ae9e0199f2@eucas1p1.samsung.com>
2025-08-24 8:45 ` [PATCH v1 0/4] Apply DP helper APIs to do link train Damon Ding
2025-08-24 8:45 ` [PATCH v1 1/4] drm/bridge: analogix_dp: Apply DP helper API drm_dp_dpcd_read_link_status() Damon Ding
2025-08-24 8:45 ` [PATCH v1 2/4] drm/bridge: analogix_dp: Apply DP helper API drm_dp_clock_recovery_ok() Damon Ding
2025-08-24 8:45 ` [PATCH v1 3/4] drm/bridge: analogix_dp: Apply DP helper API drm_dp_channel_eq_ok() Damon Ding
2025-08-24 8:45 ` Damon Ding [this message]
2025-08-25 14:25 ` [PATCH v1 0/4] Apply DP helper APIs to do link train Marek Szyprowski
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20250824084529.3317985-5-damon.ding@rock-chips.com \
--to=damon.ding@rock-chips.com \
--cc=Laurent.pinchart@ideasonboard.com \
--cc=airlied@gmail.com \
--cc=andrzej.hajda@intel.com \
--cc=andy.yan@rock-chips.com \
--cc=dianders@chromium.org \
--cc=dmitry.baryshkov@oss.qualcomm.com \
--cc=dri-devel@lists.freedesktop.org \
--cc=jernej.skrabec@gmail.com \
--cc=jonas@kwiboo.se \
--cc=linux-kernel@vger.kernel.org \
--cc=m.szyprowski@samsung.com \
--cc=maarten.lankhorst@linux.intel.com \
--cc=mripard@kernel.org \
--cc=neil.armstrong@linaro.org \
--cc=rfoss@kernel.org \
--cc=simona@ffwll.ch \
--cc=tzimmermann@suse.de \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
all inboxes | Powered by JetHome®