From: Vicente Bergas <vicencb@gmail.com>
To: "Doug Anderson" <dianders@chromium.org>,
crj <algea.cao@rock-chips.com>,
"Andy Yan" <andy.yan@rock-chips.com>,
"Sandy Huang" <hjc@rock-chips.com>,
"Heiko Stübner" <heiko@sntech.de>,
"David Airlie" <airlied@linux.ie>,
"Daniel Vetter" <daniel@ffwll.ch>,
dri-devel@lists.freedesktop.org,
linux-rockchip@lists.infradead.org
Cc: Vicente Bergas <vicencb@gmail.com>
Subject: [PATCH v2 1/3] drm: rockchip: hdmi: fix clock rounding code
Date: Tue, 22 Sep 2020 22:31:05 +0200 [thread overview]
Message-ID: <20200922203107.2932-2-vicencb@gmail.com> (raw)
In-Reply-To: <20200922203107.2932-1-vicencb@gmail.com>
Under certain conditions vop_crtc_mode_fixup rounds the clock
148500000 to 148501000 which leads to the following error:
dwhdmi-rockchip ff940000.hdmi: PHY configuration failed (clock 148501000)
The issue was found on RK3399 booting with u-boot. U-boot configures the
display at 2560x1440 and then linux comes up with a black screen.
A workaround was to un-plug and re-plug the HDMI display.
Signed-off-by: Vicente Bergas <vicencb@gmail.com>
Tested-by: Vicente Bergas <vicencb@gmail.com>
---
drivers/gpu/drm/rockchip/rockchip_drm_vop.c | 7 ++-----
1 file changed, 2 insertions(+), 5 deletions(-)
diff --git a/drivers/gpu/drm/rockchip/rockchip_drm_vop.c b/drivers/gpu/drm/rockchip/rockchip_drm_vop.c
index c80f7d9fd13f..92efbd899dee 100644
--- a/drivers/gpu/drm/rockchip/rockchip_drm_vop.c
+++ b/drivers/gpu/drm/rockchip/rockchip_drm_vop.c
@@ -1176,12 +1176,9 @@ static bool vop_crtc_mode_fixup(struct drm_crtc *crtc,
*
* 2. Get the clock framework to round the rate for us to tell us
* what it will actually make.
- *
- * 3. Store the rounded up rate so that we don't need to worry about
- * this in the actual clk_set_rate().
*/
rate = clk_round_rate(vop->dclk, adjusted_mode->clock * 1000 + 999);
- adjusted_mode->clock = DIV_ROUND_UP(rate, 1000);
+ adjusted_mode->clock = rate / 1000;
return true;
}
@@ -1380,7 +1377,7 @@ static void vop_crtc_atomic_enable(struct drm_crtc *crtc,
VOP_REG_SET(vop, intr, line_flag_num[0], vact_end);
- clk_set_rate(vop->dclk, adjusted_mode->clock * 1000);
+ clk_set_rate(vop->dclk, adjusted_mode->clock * 1000 + 999);
VOP_REG_SET(vop, common, standby, 0);
mutex_unlock(&vop->vop_lock);
--
2.28.0
_______________________________________________
Linux-rockchip mailing list
Linux-rockchip@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-rockchip
next prev parent reply other threads:[~2020-09-22 20:31 UTC|newest]
Thread overview: 9+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-09-22 20:31 [PATCH v2 0/3] drm: rockchip: hdmi: enable higher resolutions than FHD Vicente Bergas
2020-09-22 20:31 ` Vicente Bergas [this message]
2020-09-23 1:37 ` [PATCH v2 1/3] drm: rockchip: hdmi: fix clock rounding code crj
2020-09-23 22:58 ` Doug Anderson
2020-09-23 22:55 ` Doug Anderson
2020-09-22 20:31 ` [PATCH v2 2/3] drm: rockchip: hdmi: allow any clock that is within the range Vicente Bergas
2020-09-22 20:31 ` [PATCH v2 3/3] drm: rockchip: hdmi: add higher pixel clock frequencies Vicente Bergas
2020-09-23 22:18 ` [PATCH v2 0/3] drm: rockchip: hdmi: enable higher resolutions than FHD Robin Murphy
2020-09-23 23:25 ` Doug Anderson
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=20200922203107.2932-2-vicencb@gmail.com \
--to=vicencb@gmail.com \
--cc=airlied@linux.ie \
--cc=algea.cao@rock-chips.com \
--cc=andy.yan@rock-chips.com \
--cc=daniel@ffwll.ch \
--cc=dianders@chromium.org \
--cc=dri-devel@lists.freedesktop.org \
--cc=heiko@sntech.de \
--cc=hjc@rock-chips.com \
--cc=linux-rockchip@lists.infradead.org \
/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).