| Message ID | 1475066506-31750-1-git-send-email-bgolaszewski@baylibre.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
On 09/28/16 15:41, Bartosz Golaszewski wrote: > Some architectures don't use the common clock framework and don't > implement all the clk interfaces for every clock. This is the case > for da850-lcdk where clk_set_rate() only works for PLL0 and PLL1. > > Trying to set the clock rate for the LCDC clock results in -EINVAL > being returned. > > As a workaround for that: if the call to clk_set_rate() fails, fall > back to adjusting the clock divider instead. Proper divider value is > calculated by dividing the current clock rate by the required pixel > clock rate in HZ. > > This code is based on a hack initially developed internally for > baylibre by Karl Beldan <kbeldan@baylibre.com>. > > Tested with a da850-lcdk with an LCD display connected over VGA. > > Signed-off-by: Bartosz Golaszewski <bgolaszewski@baylibre.com> > --- > v1 -> v2: > - rebased on top of current drm-next > - removed unnecessary error messages > - removed an extra newline > - added a warning if the effective pixel clock rate differs much from > the requested rate > > Retested with modetest -M tilcdc -s 26:800x600@RG16 using some > additional work-in-progress changes on top of this patch. > > drivers/gpu/drm/tilcdc/tilcdc_crtc.c | 50 ++++++++++++++++++++++++++++++++---- > 1 file changed, 45 insertions(+), 5 deletions(-) > > diff --git a/drivers/gpu/drm/tilcdc/tilcdc_crtc.c b/drivers/gpu/drm/tilcdc/tilcdc_crtc.c > index 52ebe8f..7346f300b 100644 > --- a/drivers/gpu/drm/tilcdc/tilcdc_crtc.c > +++ b/drivers/gpu/drm/tilcdc/tilcdc_crtc.c > @@ -320,23 +320,63 @@ static bool tilcdc_crtc_mode_fixup(struct drm_crtc *crtc, > return true; > } > > +/* > + * Calculate the percentage difference between the requested pixel clock rate > + * and the effective rate resulting from calculating the clock divider value. > + */ > +static unsigned int tilcdc_pclk_diff(unsigned long rate, > + unsigned long real_rate) > +{ > + int r = rate / 100, rr = real_rate / 100; > + > + return (unsigned int)(abs(((rr - r) * 100) / r)); > +} > + > static void tilcdc_crtc_set_clk(struct drm_crtc *crtc) > { > struct drm_device *dev = crtc->dev; > struct tilcdc_drm_private *priv = dev->dev_private; > struct tilcdc_crtc *tilcdc_crtc = to_tilcdc_crtc(crtc); > - const unsigned clkdiv = 2; /* using a fixed divider of 2 */ > + unsigned long rate, real_rate; > + unsigned int clkdiv; > int ret; > > + clkdiv = 2; /* first try using a standard divider of 2 */ > + > /* mode.clock is in KHz, set_rate wants parameter in Hz */ > ret = clk_set_rate(priv->clk, crtc->mode.clock * 1000 * clkdiv); > + rate = clk_get_rate(priv->clk); > if (ret < 0) { > - dev_err(dev->dev, "failed to set display clock rate to: %d\n", > - crtc->mode.clock); > - return; > + /* > + * If we fail to set the clock rate (some architectures don't > + * use the common clock framework yet and may not implement > + * all the clk API calls for every clock), try the next best > + * thing: adjusting the clock divider, unless clk_get_rate() > + * failed as well. > + */ > + if (!rate) { > + /* Nothing more we can do. Just bail out. */ > + dev_err(dev->dev, > + "failed to set the pixel clock - unable to read current lcdc clock rate\n"); > + return; > + } > + > + clkdiv = DIV_ROUND_CLOSEST(rate, (crtc->mode.clock * 1000)); > + > + /* > + * Emit a warning if the real clock rate resulting from the > + * calculated divider differs much from the requested rate. > + * > + * 5% is an arbitrary value - LCDs are usually quite tolerant > + * about pixel clock rates. > + */ > + real_rate = clkdiv * crtc->mode.clock * 1000; > + > + WARN_ONCE(tilcdc_pclk_diff(rate, real_rate) > 5, > + "real pixel clock rate diverged from the requested rate more than 5%%\n"); I'd say that a warn with backtrace over kill here (we know quite well how we end up here). And it would be helpful to know in actual numbers what the clock should have been and how close to it did we get. Otherwise the patch appears to work fine at least on am335x. BR, Jyri > } > > - tilcdc_crtc->lcd_fck_rate = clk_get_rate(priv->clk); > + tilcdc_crtc->lcd_fck_rate = rate; > > DBG("lcd_clk=%u, mode clock=%d, div=%u", > tilcdc_crtc->lcd_fck_rate, crtc->mode.clock, clkdiv); >
2016-09-29 9:55 GMT+02:00 Jyri Sarha <jsarha@ti.com>: > On 09/28/16 15:41, Bartosz Golaszewski wrote: >> Some architectures don't use the common clock framework and don't >> implement all the clk interfaces for every clock. This is the case >> for da850-lcdk where clk_set_rate() only works for PLL0 and PLL1. >> >> Trying to set the clock rate for the LCDC clock results in -EINVAL >> being returned. >> >> As a workaround for that: if the call to clk_set_rate() fails, fall >> back to adjusting the clock divider instead. Proper divider value is >> calculated by dividing the current clock rate by the required pixel >> clock rate in HZ. >> >> This code is based on a hack initially developed internally for >> baylibre by Karl Beldan <kbeldan@baylibre.com>. >> >> Tested with a da850-lcdk with an LCD display connected over VGA. >> >> Signed-off-by: Bartosz Golaszewski <bgolaszewski@baylibre.com> > > I'd say that a warn with backtrace over kill here (we know quite well > how we end up here). And it would be helpful to know in actual numbers > what the clock should have been and how close to it did we get. > > Otherwise the patch appears to work fine at least on am335x. > Actually there's one more issue - the requested clock rate is in crtc->mode.clock, not in the rate variable, so that needs fixing too for the message to be correct. Best regards, Bartosz Golaszewski
diff --git a/drivers/gpu/drm/tilcdc/tilcdc_crtc.c b/drivers/gpu/drm/tilcdc/tilcdc_crtc.c index 52ebe8f..7346f300b 100644 --- a/drivers/gpu/drm/tilcdc/tilcdc_crtc.c +++ b/drivers/gpu/drm/tilcdc/tilcdc_crtc.c @@ -320,23 +320,63 @@ static bool tilcdc_crtc_mode_fixup(struct drm_crtc *crtc, return true; } +/* + * Calculate the percentage difference between the requested pixel clock rate + * and the effective rate resulting from calculating the clock divider value. + */ +static unsigned int tilcdc_pclk_diff(unsigned long rate, + unsigned long real_rate) +{ + int r = rate / 100, rr = real_rate / 100; + + return (unsigned int)(abs(((rr - r) * 100) / r)); +} + static void tilcdc_crtc_set_clk(struct drm_crtc *crtc) { struct drm_device *dev = crtc->dev; struct tilcdc_drm_private *priv = dev->dev_private; struct tilcdc_crtc *tilcdc_crtc = to_tilcdc_crtc(crtc); - const unsigned clkdiv = 2; /* using a fixed divider of 2 */ + unsigned long rate, real_rate; + unsigned int clkdiv; int ret; + clkdiv = 2; /* first try using a standard divider of 2 */ + /* mode.clock is in KHz, set_rate wants parameter in Hz */ ret = clk_set_rate(priv->clk, crtc->mode.clock * 1000 * clkdiv); + rate = clk_get_rate(priv->clk); if (ret < 0) { - dev_err(dev->dev, "failed to set display clock rate to: %d\n", - crtc->mode.clock); - return; + /* + * If we fail to set the clock rate (some architectures don't + * use the common clock framework yet and may not implement + * all the clk API calls for every clock), try the next best + * thing: adjusting the clock divider, unless clk_get_rate() + * failed as well. + */ + if (!rate) { + /* Nothing more we can do. Just bail out. */ + dev_err(dev->dev, + "failed to set the pixel clock - unable to read current lcdc clock rate\n"); + return; + } + + clkdiv = DIV_ROUND_CLOSEST(rate, (crtc->mode.clock * 1000)); + + /* + * Emit a warning if the real clock rate resulting from the + * calculated divider differs much from the requested rate. + * + * 5% is an arbitrary value - LCDs are usually quite tolerant + * about pixel clock rates. + */ + real_rate = clkdiv * crtc->mode.clock * 1000; + + WARN_ONCE(tilcdc_pclk_diff(rate, real_rate) > 5, + "real pixel clock rate diverged from the requested rate more than 5%%\n"); } - tilcdc_crtc->lcd_fck_rate = clk_get_rate(priv->clk); + tilcdc_crtc->lcd_fck_rate = rate; DBG("lcd_clk=%u, mode clock=%d, div=%u", tilcdc_crtc->lcd_fck_rate, crtc->mode.clock, clkdiv);
Some architectures don't use the common clock framework and don't implement all the clk interfaces for every clock. This is the case for da850-lcdk where clk_set_rate() only works for PLL0 and PLL1. Trying to set the clock rate for the LCDC clock results in -EINVAL being returned. As a workaround for that: if the call to clk_set_rate() fails, fall back to adjusting the clock divider instead. Proper divider value is calculated by dividing the current clock rate by the required pixel clock rate in HZ. This code is based on a hack initially developed internally for baylibre by Karl Beldan <kbeldan@baylibre.com>. Tested with a da850-lcdk with an LCD display connected over VGA. Signed-off-by: Bartosz Golaszewski <bgolaszewski@baylibre.com> --- v1 -> v2: - rebased on top of current drm-next - removed unnecessary error messages - removed an extra newline - added a warning if the effective pixel clock rate differs much from the requested rate Retested with modetest -M tilcdc -s 26:800x600@RG16 using some additional work-in-progress changes on top of this patch. drivers/gpu/drm/tilcdc/tilcdc_crtc.c | 50 ++++++++++++++++++++++++++++++++---- 1 file changed, 45 insertions(+), 5 deletions(-)