Groups | Search | Server Info | Keyboard shortcuts | Login | Register [http] [https] [nntp] [nntps]

Groups > linux.kernel > #1712524

[PATCH v6 1/5] drm/vc4: Move the DSI clock divider workaround closer to the clock call.

Show all headers | View raw

We want the adjusted_mode->clock to be the actual clock we're
expecting to program, so that consumers see the right values for clock
and vrefresh.

Signed-off-by: Eric Anholt <eric@anholt.net>
---
 drivers/gpu/drm/vc4/vc4_dsi.c | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/drivers/gpu/drm/vc4/vc4_dsi.c b/drivers/gpu/drm/vc4/vc4_dsi.c
index d1e0dc908048..eb787eed8abe 100644
--- a/drivers/gpu/drm/vc4/vc4_dsi.c
+++ b/drivers/gpu/drm/vc4/vc4_dsi.c
@@ -859,11 +859,7 @@ static bool vc4_dsi_encoder_mode_fixup(struct drm_encoder *encoder,
 	pll_clock = parent_rate / divider;
 	pixel_clock_hz = pll_clock / dsi->divider;
 
-	/* Round up the clk_set_rate() request slightly, since
-	 * PLLD_DSI1 is an integer divider and its rate selection will
-	 * never round up.
-	 */
-	adjusted_mode->clock = pixel_clock_hz / 1000 + 1;
+	adjusted_mode->clock = pixel_clock_hz / 1000;
 
 	/* Given the new pixel clock, adjust HFP to keep vrefresh the same. */
 	adjusted_mode->htotal = pixel_clock_hz / (mode->vrefresh * mode->vtotal);
@@ -900,7 +896,11 @@ static void vc4_dsi_encoder_enable(struct drm_encoder *encoder)
 		vc4_dsi_dump_regs(dsi);
 	}
 
-	phy_clock = pixel_clock_hz * dsi->divider;
+	/* Round up the clk_set_rate() request slightly, since
+	 * PLLD_DSI1 is an integer divider and its rate selection will
+	 * never round up.
+	 */
+	phy_clock = (pixel_clock_hz + 1000) * dsi->divider;
 	ret = clk_set_rate(dsi->pll_phy_clock, phy_clock);
 	if (ret) {
 		dev_err(&dsi->pdev->dev,
-- 
2.14.1

Back to linux.kernel | Previous | Next — Next in thread | Find similar | Unroll thread

Thread

[PATCH v6 1/5] drm/vc4: Move the DSI clock divider workaround closer to the clock call. Eric Anholt <eric@anholt.net> - 2017-08-16 02:00 +0200
  [PATCH v6 5/5] drm/panel: Add support for the Raspberry Pi 7" Touchscreen. Eric Anholt <eric@anholt.net> - 2017-08-16 02:00 +0200
  [PATCH v6 2/5] drm/vc4: Avoid using vrefresh==0 mode in DSI htotal math. Eric Anholt <eric@anholt.net> - 2017-08-16 02:00 +0200
    Re: [PATCH v6 2/5] drm/vc4: Avoid using vrefresh==0 mode in DSI htotal  math. Andrzej Hajda <a.hajda@samsung.com> - 2017-08-16 09:00 +0200
  [PATCH v6 4/5] dt-bindings: Document the Raspberry Pi Touchscreen nodes. Eric Anholt <eric@anholt.net> - 2017-08-16 02:00 +0200
  [PATCH v6 3/5] drm/vc4: Set up the DSI host at pdev probe time, not component bind. Eric Anholt <eric@anholt.net> - 2017-08-16 02:00 +0200
    Re: [PATCH v6 3/5] drm/vc4: Set up the DSI host at pdev probe time,  not component bind. Archit Taneja <architt@codeaurora.org> - 2017-08-17 05:50 +0200

csiph-web