From: Lucas Stach <l.stach@pengutronix.de>
To: "Heiko Stübner" <heiko@sntech.de>,
"Andy Yan" <andy.yan@rock-chips.com>,
"Sandy Huang" <hjc@rock-chips.com>,
"Jingoo Han" <jingoohan1@gmail.com>,
"Inki Dae" <inki.dae@samsung.com>,
"Seung-Woo Kim" <sw0312.kim@samsung.com>,
"Kyungmin Park" <kyungmin.park@samsung.com>,
"Andrzej Hajda" <andrzej.hajda@intel.com>,
"Neil Armstrong" <neil.armstrong@linaro.org>,
"Robert Foss" <rfoss@kernel.org>,
"Laurent Pinchart" <Laurent.pinchart@ideasonboard.com>,
"Jonas Karlman" <jonas@kwiboo.se>,
"Jernej Skrabec" <jernej.skrabec@gmail.com>
Cc: linux-arm-kernel@lists.infradead.org,
linux-samsung-soc@vger.kernel.org,
linux-rockchip@lists.infradead.org,
dri-devel@lists.freedesktop.org, kernel@pengutronix.de,
patchwork-lst@pengutronix.de
Subject: [PATCH 12/14] drm/bridge: analogix_dp: simplify and correct PLL lock checks
Date: Fri, 3 May 2024 17:11:27 +0200 [thread overview]
Message-ID: <20240503151129.3901815-13-l.stach@pengutronix.de> (raw)
In-Reply-To: <20240503151129.3901815-1-l.stach@pengutronix.de>
Move the wait loop into its own function, so it doesn't need to be
replicated in multiple locations. Also move the PLL lock checks between
setting the link bandwidth, which may cause the PLL to unlock, and the
MACRO_RST, which needs the PLL to be locked.
Signed-off-by: Lucas Stach <l.stach@pengutronix.de>
---
.../drm/bridge/analogix/analogix_dp_core.c | 34 +++++++------------
.../drm/bridge/analogix/analogix_dp_core.h | 7 +---
.../gpu/drm/bridge/analogix/analogix_dp_reg.c | 12 +++----
3 files changed, 18 insertions(+), 35 deletions(-)
diff --git a/drivers/gpu/drm/bridge/analogix/analogix_dp_core.c b/drivers/gpu/drm/bridge/analogix/analogix_dp_core.c
index 736b2ed745e1..7bbc3d8a85df 100644
--- a/drivers/gpu/drm/bridge/analogix/analogix_dp_core.c
+++ b/drivers/gpu/drm/bridge/analogix/analogix_dp_core.c
@@ -231,7 +231,7 @@ static int analogix_dp_training_pattern_dis(struct analogix_dp_device *dp)
static int analogix_dp_link_start(struct analogix_dp_device *dp)
{
u8 buf[4];
- int lane, lane_count, pll_tries, retval;
+ int lane, lane_count, retval;
lane_count = dp->link_train.lane_count;
@@ -243,6 +243,11 @@ static int analogix_dp_link_start(struct analogix_dp_device *dp)
/* Set link rate and count as you want to establish*/
analogix_dp_set_link_bandwidth(dp, dp->link_train.link_rate);
+ retval = analogix_dp_wait_pll_locked(dp);
+ if (retval) {
+ DRM_DEV_ERROR(dp->dev, "Wait for pll lock failed %d\n", retval);
+ return retval;
+ }
/*
* MACRO_RST must be applied after the PLL_LOCK to avoid
* the DP inter pair skew issue for at least 10 us
@@ -270,18 +275,6 @@ static int analogix_dp_link_start(struct analogix_dp_device *dp)
DP_TRAIN_PRE_EMPH_LEVEL_0;
analogix_dp_set_lane_link_training(dp);
- /* Wait for PLL lock */
- pll_tries = 0;
- while (analogix_dp_get_pll_lock_status(dp) == PLL_UNLOCKED) {
- if (pll_tries == DP_TIMEOUT_LOOP_COUNT) {
- dev_err(dp->dev, "Wait for PLL lock timed out\n");
- return -ETIMEDOUT;
- }
-
- pll_tries++;
- usleep_range(90, 120);
- }
-
/* Set training pattern 1 */
analogix_dp_set_training_pattern(dp, TRAINING_PTN1);
@@ -634,9 +627,14 @@ static int analogix_dp_fast_link_train(struct analogix_dp_device *dp)
{
int ret;
u8 link_align, link_status[2];
- enum pll_status status;
analogix_dp_set_link_bandwidth(dp, dp->link_train.link_rate);
+ ret = analogix_dp_wait_pll_locked(dp);
+ if (ret) {
+ DRM_DEV_ERROR(dp->dev, "Wait for pll lock failed %d\n", ret);
+ return ret;
+ }
+
/*
* MACRO_RST must be applied after the PLL_LOCK to avoid
* the DP inter pair skew issue for at least 10 us
@@ -645,14 +643,6 @@ static int analogix_dp_fast_link_train(struct analogix_dp_device *dp)
analogix_dp_set_lane_count(dp, dp->link_train.lane_count);
analogix_dp_set_lane_link_training(dp);
- ret = readx_poll_timeout(analogix_dp_get_pll_lock_status, dp, status,
- status != PLL_UNLOCKED, 120,
- 120 * DP_TIMEOUT_LOOP_COUNT);
- if (ret) {
- DRM_DEV_ERROR(dp->dev, "Wait for pll lock failed %d\n", ret);
- return ret;
- }
-
/* source Set training pattern 1 */
analogix_dp_set_training_pattern(dp, TRAINING_PTN1);
/* From DP spec, pattern must be on-screen for a minimum 500us */
diff --git a/drivers/gpu/drm/bridge/analogix/analogix_dp_core.h b/drivers/gpu/drm/bridge/analogix/analogix_dp_core.h
index 382b2f068ab9..774d11574b09 100644
--- a/drivers/gpu/drm/bridge/analogix/analogix_dp_core.h
+++ b/drivers/gpu/drm/bridge/analogix/analogix_dp_core.h
@@ -95,11 +95,6 @@ enum dynamic_range {
CEA
};
-enum pll_status {
- PLL_UNLOCKED,
- PLL_LOCKED
-};
-
enum clock_recovery_m_value_type {
CALCULATED_M,
REGISTER_M
@@ -191,7 +186,7 @@ void analogix_dp_swreset(struct analogix_dp_device *dp);
void analogix_dp_config_interrupt(struct analogix_dp_device *dp);
void analogix_dp_mute_hpd_interrupt(struct analogix_dp_device *dp);
void analogix_dp_unmute_hpd_interrupt(struct analogix_dp_device *dp);
-enum pll_status analogix_dp_get_pll_lock_status(struct analogix_dp_device *dp);
+int analogix_dp_wait_pll_locked(struct analogix_dp_device *dp);
void analogix_dp_set_pll_power_down(struct analogix_dp_device *dp, bool enable);
void analogix_dp_set_analog_power_down(struct analogix_dp_device *dp,
enum analog_power_block block,
diff --git a/drivers/gpu/drm/bridge/analogix/analogix_dp_reg.c b/drivers/gpu/drm/bridge/analogix/analogix_dp_reg.c
index e9c643a8b6fc..143a78b1d156 100644
--- a/drivers/gpu/drm/bridge/analogix/analogix_dp_reg.c
+++ b/drivers/gpu/drm/bridge/analogix/analogix_dp_reg.c
@@ -217,15 +217,13 @@ void analogix_dp_unmute_hpd_interrupt(struct analogix_dp_device *dp)
writel(reg, dp->reg_base + ANALOGIX_DP_INT_STA_MASK);
}
-enum pll_status analogix_dp_get_pll_lock_status(struct analogix_dp_device *dp)
+int analogix_dp_wait_pll_locked(struct analogix_dp_device *dp)
{
- u32 reg;
+ u32 val;
- reg = readl(dp->reg_base + ANALOGIX_DP_DEBUG_CTL);
- if (reg & PLL_LOCK)
- return PLL_LOCKED;
- else
- return PLL_UNLOCKED;
+ return readl_poll_timeout(dp->reg_base + ANALOGIX_DP_DEBUG_CTL, val,
+ val & PLL_LOCK, 120,
+ 120 * DP_TIMEOUT_LOOP_COUNT);
}
void analogix_dp_set_pll_power_down(struct analogix_dp_device *dp, bool enable)
--
2.39.2
next prev parent reply other threads:[~2024-05-03 15:12 UTC|newest]
Thread overview: 27+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-05-03 15:11 [PATCH 00/14] improve Analogix DP AUX channel handling Lucas Stach
2024-05-03 15:11 ` [PATCH 01/14] drm/bridge: analogix_dp: remove unused platform power_on_end callback Lucas Stach
2024-05-07 12:02 ` Robert Foss
2024-05-03 15:11 ` [PATCH 02/14] drm/rockchip: analogix_dp: add runtime PM handling Lucas Stach
2024-05-07 12:15 ` Robert Foss
2024-05-03 15:11 ` [PATCH 03/14] drm/bridge: analogix_dp: register AUX bus after enabling runtime PM Lucas Stach
2024-05-07 12:49 ` Robert Foss
2024-05-03 15:11 ` [PATCH 04/14] drm/bridge: analogix_dp: handle clock via " Lucas Stach
2024-05-07 12:57 ` Robert Foss
2024-05-03 15:11 ` [PATCH 05/14] drm/bridge: analogix_dp: remove unused analogix_dp_remove Lucas Stach
2024-05-07 12:58 ` Robert Foss
2024-05-03 15:11 ` [PATCH 06/14] drm/bridge: analogix_dp: remove clk handling from analogix_dp_set_bridge Lucas Stach
2024-05-07 13:00 ` Robert Foss
2024-05-03 15:11 ` [PATCH 07/14] drm/bridge: analogix_dp: move platform and PHY power handling into runtime PM Lucas Stach
2024-05-07 13:01 ` Robert Foss
2024-05-03 15:11 ` [PATCH 08/14] drm/bridge: analogix_dp: move basic controller init " Lucas Stach
2024-05-07 13:05 ` Robert Foss
2024-05-03 15:11 ` [PATCH 09/14] drm/bridge: analogix_dp: remove PLL lock check from analogix_dp_config_video Lucas Stach
2024-05-07 13:06 ` Robert Foss
2024-05-03 15:11 ` [PATCH 10/14] drm/bridge: analogix_dp: move macro reset after link bandwidth setting Lucas Stach
2024-05-07 13:07 ` Robert Foss
2024-05-03 15:11 ` [PATCH 11/14] drm/bridge: analogix_dp: don't wait for PLL lock too early Lucas Stach
2024-05-03 15:11 ` Lucas Stach [this message]
2024-05-03 15:11 ` [PATCH 13/14] drm/bridge: analogix_dp: only read AUX status when an error occured Lucas Stach
2024-05-03 15:11 ` [PATCH 14/14] drm/bridge: analogix_dp: handle AUX transfer timeouts Lucas Stach
2024-05-07 13:10 ` [PATCH 00/14] improve Analogix DP AUX channel handling Robert Foss
2024-05-15 10:31 ` Lucas Stach
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=20240503151129.3901815-13-l.stach@pengutronix.de \
--to=l.stach@pengutronix.de \
--cc=Laurent.pinchart@ideasonboard.com \
--cc=andrzej.hajda@intel.com \
--cc=andy.yan@rock-chips.com \
--cc=dri-devel@lists.freedesktop.org \
--cc=heiko@sntech.de \
--cc=hjc@rock-chips.com \
--cc=inki.dae@samsung.com \
--cc=jernej.skrabec@gmail.com \
--cc=jingoohan1@gmail.com \
--cc=jonas@kwiboo.se \
--cc=kernel@pengutronix.de \
--cc=kyungmin.park@samsung.com \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-rockchip@lists.infradead.org \
--cc=linux-samsung-soc@vger.kernel.org \
--cc=neil.armstrong@linaro.org \
--cc=patchwork-lst@pengutronix.de \
--cc=rfoss@kernel.org \
--cc=sw0312.kim@samsung.com \
/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;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).