From: Yakir Yang <ykk@rock-chips.com>
To: Sean Paul <seanpaul@chromium.org>
Cc: "Daniel Vetter" <daniel.vetter@ffwll.ch>,
"Inki Dae" <inki.dae@samsung.com>,
"David Airlie" <airlied@linux.ie>,
"Tomeu Vizoso" <tomeu.vizoso@collabora.com>,
"Mika Kahola" <mika.kahola@intel.com>,
"Stéphane Marchesin" <marcheu@chromium.org>,
"Tomasz Figa" <tfiga@chromium.org>,
"Douglas Anderson" <dianders@chromium.org>,
"Thierry Reding" <treding@nvidia.com>,
"Krzysztof Kozlowski" <k.kozlowski@samsung.com>,
"Heiko Stuebner" <heiko@sntech.de>,
"Jingoo Han" <jingoohan1@gmail.com>,
"Javier Martinez Canillas" <javier@osg.samsung.com>,
"Linux Kernel Mailing List" <linux-kernel@vger.kernel.org>,
dri-devel <dri-devel@lists.freedesktop.org>,
linux-samsung-soc <linux-samsung-soc@vger.kernel.org>,
linux-rockchip@lists.infradead.org
Subject: Re: [PATCH v3 2/3] drm/bridge: analogix_dp: use jiffies to simulate timeout loop
Date: Tue, 20 Sep 2016 10:18:38 +0800 [thread overview]
Message-ID: <01b6f408-ba3b-b2c0-b9f2-097420ef96cb@rock-chips.com> (raw)
In-Reply-To: <CAOw6vbLhXONEGfWP8B+bkJE+H0oAZb0hPyAP9SodNu-m3cXrGQ@mail.gmail.com>
Hi Sean,
On 09/12/2016 09:51 PM, Sean Paul wrote:
> On Fri, Sep 9, 2016 at 5:44 AM, Yakir Yang <ykk@rock-chips.com> wrote:
>> Signed-off-by: Yakir Yang <ykk@rock-chips.com>
>> ---
>> Changes in v3:
>> - Suggested by Sean
>>
>> Changes in v2: None
>>
>> drivers/gpu/drm/bridge/analogix/analogix_dp_core.h | 3 ++-
>> drivers/gpu/drm/bridge/analogix/analogix_dp_reg.c | 18 +++++++++---------
>> 2 files changed, 11 insertions(+), 10 deletions(-)
>>
>> diff --git a/drivers/gpu/drm/bridge/analogix/analogix_dp_core.h b/drivers/gpu/drm/bridge/analogix/analogix_dp_core.h
>> index a15f076..d564e90 100644
>> --- a/drivers/gpu/drm/bridge/analogix/analogix_dp_core.h
>> +++ b/drivers/gpu/drm/bridge/analogix/analogix_dp_core.h
>> @@ -16,10 +16,11 @@
>> #include <drm/drm_crtc.h>
>> #include <drm/drm_dp_helper.h>
>>
>> -#define DP_TIMEOUT_LOOP_COUNT 100
>> #define MAX_CR_LOOP 5
>> #define MAX_EQ_LOOP 5
>>
>> +#define DP_TIMEOUT_LOOP_MS msecs_to_jiffies(1)
> The name suggests the units here are ms, but you're storing jiffies.
> Do the msecs_to_jiffies conversion down below.
I suddenly realized that 'analogix_dp_core.c' also used the
'DP_TIMEOUT_LOOP_COUNT' macros, and 'analogix_dp_core.c' have four kinds
of timeout,
- DP_TIMEOUT_LOOP_COUNT * 1us
- DP_TIMEOUT_LOOP_COUNT * 10us
- DP_TIMEOUT_LOOP_COUNT * 100us
- DP_TIMEOUT_LOOP_COUNT * 1000us
I may guess it's not necessary to replace the 'DP_TIMEOUT_LOOP_COUNT'
now :-)
- Yakir
>
>> +
>> /* DP_MAX_LANE_COUNT */
>> #define DPCD_ENHANCED_FRAME_CAP(x) (((x) >> 7) & 0x1)
>> #define DPCD_MAX_LANE_COUNT(x) ((x) & 0x1f)
>> diff --git a/drivers/gpu/drm/bridge/analogix/analogix_dp_reg.c b/drivers/gpu/drm/bridge/analogix/analogix_dp_reg.c
>> index a4d17b8..15a4cf0 100644
>> --- a/drivers/gpu/drm/bridge/analogix/analogix_dp_reg.c
>> +++ b/drivers/gpu/drm/bridge/analogix/analogix_dp_reg.c
>> @@ -335,7 +335,7 @@ void analogix_dp_set_analog_power_down(struct analogix_dp_device *dp,
>> void analogix_dp_init_analog_func(struct analogix_dp_device *dp)
>> {
>> u32 reg;
>> - int timeout_loop = 0;
>> + unsigned long timeout;
>>
>> analogix_dp_set_analog_power_down(dp, POWER_ALL, 0);
>>
>> @@ -350,9 +350,9 @@ void analogix_dp_init_analog_func(struct analogix_dp_device *dp)
>> if (analogix_dp_get_pll_lock_status(dp) == PLL_UNLOCKED) {
>> analogix_dp_set_pll_power_down(dp, 0);
>>
>> + timeout = jiffies + DP_TIMEOUT_LOOP_MS;
> timeout = jiffies + msecs_to_jiffies(DP_TIMEOUT_LOOP_MS);
>
>> while (analogix_dp_get_pll_lock_status(dp) == PLL_UNLOCKED) {
>> - timeout_loop++;
>> - if (DP_TIMEOUT_LOOP_COUNT < timeout_loop) {
>> + if (time_after(jiffies, timeout)) {
>> dev_err(dp->dev, "failed to get pll lock status\n");
>> return;
>> }
>> @@ -501,7 +501,7 @@ int analogix_dp_start_aux_transaction(struct analogix_dp_device *dp)
>> {
>> int reg;
>> int retval = 0;
>> - int timeout_loop = 0;
>> + unsigned long timeout;
>>
>> /* Enable AUX CH operation */
>> reg = readl(dp->reg_base + ANALOGIX_DP_AUX_CH_CTL_2);
>> @@ -509,10 +509,10 @@ int analogix_dp_start_aux_transaction(struct analogix_dp_device *dp)
>> writel(reg, dp->reg_base + ANALOGIX_DP_AUX_CH_CTL_2);
>>
>> /* Is AUX CH command reply received? */
>> + timeout = jiffies + DP_TIMEOUT_LOOP_MS;
>> reg = readl(dp->reg_base + ANALOGIX_DP_INT_STA);
>> while (!(reg & RPLY_RECEIV)) {
>> - timeout_loop++;
>> - if (DP_TIMEOUT_LOOP_COUNT < timeout_loop) {
>> + if (time_after(jiffies, timeout)) {
>> dev_err(dp->dev, "AUX CH command reply failed!\n");
>> return -ETIMEDOUT;
>> }
>> @@ -1055,7 +1055,7 @@ ssize_t analogix_dp_transfer(struct analogix_dp_device *dp,
>> {
>> u32 reg;
>> u8 *buffer = msg->buffer;
>> - int timeout_loop = 0;
>> + unsigned long timeout;
>> unsigned int i;
>> int num_transferred = 0;
>>
>> @@ -1123,10 +1123,10 @@ ssize_t analogix_dp_transfer(struct analogix_dp_device *dp,
>>
>> /* Is AUX CH command reply received? */
>> /* TODO: Wait for an interrupt instead of looping? */
>> + timeout = jiffies + DP_TIMEOUT_LOOP_MS;
>> reg = readl(dp->reg_base + ANALOGIX_DP_INT_STA);
>> while (!(reg & RPLY_RECEIV)) {
>> - timeout_loop++;
>> - if (timeout_loop > DP_TIMEOUT_LOOP_COUNT) {
>> + if (time_after(jiffies, timeout)) {
>> dev_err(dp->dev, "AUX CH command reply failed!\n");
>> return -ETIMEDOUT;
>> }
>> --
>> 1.9.1
>>
>>
>
>
next prev parent reply other threads:[~2016-09-20 2:19 UTC|newest]
Thread overview: 11+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-09-08 3:48 [PATCH v2 1/2] drm/bridge: analogix_dp: Remove duplicated code v2 Yakir Yang
2016-09-08 3:48 ` [PATCH v2 2/2] drm/bridge: analogix_dp: detect Sink PSR state after configuring the PSR Yakir Yang
2016-09-08 14:12 ` Sean Paul
2016-09-09 9:15 ` Yakir Yang
2016-09-09 9:44 ` [PATCH v3 2/3] drm/bridge: analogix_dp: use jiffies to simulate timeout loop Yakir Yang
2016-09-12 13:51 ` Sean Paul
2016-09-20 2:18 ` Yakir Yang [this message]
2016-09-09 9:45 ` [PATCH v3 3/3] drm/bridge: analogix_dp: detect Sink PSR state after configuring the PSR Yakir Yang
2016-09-12 13:52 ` Sean Paul
2016-09-20 2:22 ` Yakir Yang
2016-09-08 13:50 ` [PATCH v2 1/2] drm/bridge: analogix_dp: Remove duplicated code v2 Sean Paul
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=01b6f408-ba3b-b2c0-b9f2-097420ef96cb@rock-chips.com \
--to=ykk@rock-chips.com \
--cc=airlied@linux.ie \
--cc=daniel.vetter@ffwll.ch \
--cc=dianders@chromium.org \
--cc=dri-devel@lists.freedesktop.org \
--cc=heiko@sntech.de \
--cc=inki.dae@samsung.com \
--cc=javier@osg.samsung.com \
--cc=jingoohan1@gmail.com \
--cc=k.kozlowski@samsung.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-rockchip@lists.infradead.org \
--cc=linux-samsung-soc@vger.kernel.org \
--cc=marcheu@chromium.org \
--cc=mika.kahola@intel.com \
--cc=seanpaul@chromium.org \
--cc=tfiga@chromium.org \
--cc=tomeu.vizoso@collabora.com \
--cc=treding@nvidia.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 NNTP newsgroup(s).