| Message ID | 1372170171-9561-23-git-send-email-detheridge@ti.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
On 25/06/13 17:22, Darren Etheridge wrote: > From: Afzal Mohammed <afzal@ti.com> > > LCDC IP has a clock divider to adjust pixel clock, this limits pixel > clock range to fck/255 - fck/2(fck - rate of input clock to LCDC IP). > In the case of AM335x, where this IP is present, default fck is not > sufficient to provide normal pixel clock rates, hence rendering this > driver unusable on AM335x. > > If input clock too is configurable, allowable range of pixel clock > would increase. Here initially it is checked whether with present fck, > divider in IP could be configured to obtain required rate, if not, > fck is adjusted. This makes it usable on AM335x. > > Note: > Another solution would be to model an inherited basic clock divider of > CCF, an advantage would be a better possible resolution for pixel clk. > And trying to instantiate a CCF clock would mean that to be consistent, > 3 bits being turned on to enable clocks of LCDC IP would have to be > modeled as gate clocks. Now that would bring in a total of 4 clocks, > including necessity to create a new inherited divider clock, and that > mean a branch of clock tree would be present in LCDC driver. This > would add complexity to LCDC driver bringing in considerable amount > of clock handling code, and this would not bring in much advantage > for existing use cases other than providing a higher resolution of > pixel clock. And existing use cases work without relying on clock > modeling. Another fact is that out of the two platform's using this > driver DaVinci is not yet converted to CCF. In future if higher > resolution of pixel clock is required, and probably after DaVinci is > CCF'ed, modeling clock nodes inside driver may be considered. > > Signed-off-by: Afzal Mohammed <afzal@ti.com> > Signed-off-by: Darren Etheridge <detheridge@ti.com> > --- > drivers/video/da8xx-fb.c | 76 +++++++++++++++++++++++++++++++++++----------- > 1 files changed, 58 insertions(+), 18 deletions(-) > > diff --git a/drivers/video/da8xx-fb.c b/drivers/video/da8xx-fb.c > index 5455682..09dfa12 100644 > --- a/drivers/video/da8xx-fb.c > +++ b/drivers/video/da8xx-fb.c > @@ -133,6 +133,9 @@ > #define WSI_TIMEOUT 50 > #define PALETTE_SIZE 256 > > +#define CLK_MIN_DIV 2 > +#define CLK_MAX_DIV 255 > + > static void __iomem *da8xx_fb_reg_base; > static struct resource *lcdc_regs; > static unsigned int lcd_revision; > @@ -683,23 +686,21 @@ static void da8xx_fb_lcd_reset(void) > } > } > > -static inline unsigned da8xx_fb_calc_clk_divider(struct da8xx_fb_par *par, > - unsigned pixclock) > -{ > - return par->lcd_fck_rate / (PICOS2KHZ(pixclock) * 1000); > -} > - > -static inline unsigned da8xx_fb_round_clk(struct da8xx_fb_par *par, > - unsigned pixclock) > +static int da8xx_fb_config_clk_divider(struct da8xx_fb_par *par, > + unsigned div, unsigned rate) I would suggest to use better names than 'div' and 'rate'. What div? What rate? > { > - unsigned div; > + int ret; > > - div = da8xx_fb_calc_clk_divider(par, pixclock); > - return KHZ2PICOS(par->lcd_fck_rate / (1000 * div)); > -} > + if (par->lcd_fck_rate != rate) { > + ret = clk_set_rate(par->lcdc_clk, rate); > + if (IS_ERR_VALUE(ret)) { > + dev_err(par->dev, > + "unable to set clock rate at %u\n", rate); > + return ret; > + } > + par->lcd_fck_rate = clk_get_rate(par->lcdc_clk); > + } I think it would be good to require that the caller has calculated the rate properly, and used clk_round_rate. So instead of silently storing the actual clock rate to lcd_fck_rate, either fail or give a warning if the resulting clock rate is different than the requested one. > -static inline void da8xx_fb_config_clk_divider(unsigned div) > -{ > /* Configure the LCD clock divisor. */ > lcdc_write(LCD_CLK_DIVISOR(div) | > (LCD_RASTER_MODE & 0x1), LCD_CTRL_REG); > @@ -707,14 +708,49 @@ static inline void da8xx_fb_config_clk_divider(unsigned div) > if (lcd_revision == LCD_VERSION_2) > lcdc_write(LCD_V2_DMA_CLK_EN | LCD_V2_LIDD_CLK_EN | > LCD_V2_CORE_CLK_EN, LCD_CLK_ENABLE_REG); > + > + return 0; > +} > + > +static unsigned int da8xx_fb_calc_clk_divider(struct da8xx_fb_par *par, > + unsigned pixclock, > + unsigned *rate) > +{ > + unsigned div; > + > + pixclock = PICOS2KHZ(pixclock) * 1000; > + > + *rate = par->lcd_fck_rate; > + > + if (pixclock < (*rate / CLK_MAX_DIV)) { > + *rate = clk_round_rate(par->lcdc_clk, pixclock * CLK_MAX_DIV); > + div = CLK_MAX_DIV; > + } else if (pixclock > (*rate / CLK_MIN_DIV)) { > + *rate = clk_round_rate(par->lcdc_clk, pixclock * CLK_MIN_DIV); > + div = CLK_MIN_DIV; > + } else { > + div = *rate / pixclock; > + } > + > + return div; > } If I understand correctly, the function returns the LCDC clock divider and the fclk clock rate, calculated for the given pixclock. What happens if this function is called with a pixel clock of 1Hz or 1GHz (ie. something not achievable)? And wouldn't it be better to always set the fclk clock rate? Even if the pixclock is in the range achieved with a divider between CLK_MIN_DIV and CLK_MAX_DIV, it can be quite far from the requested clock rate. Adjusting the fclk rate could give a much better match. > -static inline void da8xx_fb_calc_config_clk_divider(struct da8xx_fb_par *par, > +static inline int da8xx_fb_calc_config_clk_divider(struct da8xx_fb_par *par, Don't use inline. The compiler can decide if it's worth to inline a function or not. I guess inline is fine for funcs like lcdc_read(), but generally leave it for the compiler. Tomi
diff --git a/drivers/video/da8xx-fb.c b/drivers/video/da8xx-fb.c index 5455682..09dfa12 100644 --- a/drivers/video/da8xx-fb.c +++ b/drivers/video/da8xx-fb.c @@ -133,6 +133,9 @@ #define WSI_TIMEOUT 50 #define PALETTE_SIZE 256 +#define CLK_MIN_DIV 2 +#define CLK_MAX_DIV 255 + static void __iomem *da8xx_fb_reg_base; static struct resource *lcdc_regs; static unsigned int lcd_revision; @@ -683,23 +686,21 @@ static void da8xx_fb_lcd_reset(void) } } -static inline unsigned da8xx_fb_calc_clk_divider(struct da8xx_fb_par *par, - unsigned pixclock) -{ - return par->lcd_fck_rate / (PICOS2KHZ(pixclock) * 1000); -} - -static inline unsigned da8xx_fb_round_clk(struct da8xx_fb_par *par, - unsigned pixclock) +static int da8xx_fb_config_clk_divider(struct da8xx_fb_par *par, + unsigned div, unsigned rate) { - unsigned div; + int ret; - div = da8xx_fb_calc_clk_divider(par, pixclock); - return KHZ2PICOS(par->lcd_fck_rate / (1000 * div)); -} + if (par->lcd_fck_rate != rate) { + ret = clk_set_rate(par->lcdc_clk, rate); + if (IS_ERR_VALUE(ret)) { + dev_err(par->dev, + "unable to set clock rate at %u\n", rate); + return ret; + } + par->lcd_fck_rate = clk_get_rate(par->lcdc_clk); + } -static inline void da8xx_fb_config_clk_divider(unsigned div) -{ /* Configure the LCD clock divisor. */ lcdc_write(LCD_CLK_DIVISOR(div) | (LCD_RASTER_MODE & 0x1), LCD_CTRL_REG); @@ -707,14 +708,49 @@ static inline void da8xx_fb_config_clk_divider(unsigned div) if (lcd_revision == LCD_VERSION_2) lcdc_write(LCD_V2_DMA_CLK_EN | LCD_V2_LIDD_CLK_EN | LCD_V2_CORE_CLK_EN, LCD_CLK_ENABLE_REG); + + return 0; +} + +static unsigned int da8xx_fb_calc_clk_divider(struct da8xx_fb_par *par, + unsigned pixclock, + unsigned *rate) +{ + unsigned div; + + pixclock = PICOS2KHZ(pixclock) * 1000; + + *rate = par->lcd_fck_rate; + + if (pixclock < (*rate / CLK_MAX_DIV)) { + *rate = clk_round_rate(par->lcdc_clk, pixclock * CLK_MAX_DIV); + div = CLK_MAX_DIV; + } else if (pixclock > (*rate / CLK_MIN_DIV)) { + *rate = clk_round_rate(par->lcdc_clk, pixclock * CLK_MIN_DIV); + div = CLK_MIN_DIV; + } else { + div = *rate / pixclock; + } + + return div; } -static inline void da8xx_fb_calc_config_clk_divider(struct da8xx_fb_par *par, +static inline int da8xx_fb_calc_config_clk_divider(struct da8xx_fb_par *par, struct fb_videomode *mode) { - unsigned div = da8xx_fb_calc_clk_divider(par, mode->pixclock); + unsigned rate; + unsigned div = da8xx_fb_calc_clk_divider(par, mode->pixclock, &rate); - da8xx_fb_config_clk_divider(div); + return da8xx_fb_config_clk_divider(par, div, rate); +} + +static inline unsigned da8xx_fb_round_clk(struct da8xx_fb_par *par, + unsigned pixclock) +{ + unsigned div, rate; + + div = da8xx_fb_calc_clk_divider(par, pixclock, &rate); + return KHZ2PICOS(rate / (1000 * div)); } static int lcd_init(struct da8xx_fb_par *par, const struct lcd_ctrl_config *cfg, @@ -723,7 +759,11 @@ static int lcd_init(struct da8xx_fb_par *par, const struct lcd_ctrl_config *cfg, u32 bpp; int ret = 0; - da8xx_fb_calc_config_clk_divider(par, panel); + ret = da8xx_fb_calc_config_clk_divider(par, panel); + if (IS_ERR_VALUE(ret)) { + dev_err(par->dev, "unable to configure clock\n"); + return ret; + } if (panel->sync & FB_SYNC_CLK_INVERT) lcdc_write((lcdc_read(LCD_RASTER_TIMING_2_REG) |