OMAPDSS: SDI: use new clock calculation code
Use the new clock calculation code in the SDI driver. Signed-off-by: Tomi Valkeinen <tomi.valkeinen@ti.com>
This commit is contained in:
parent
72658f0716
commit
36816faadf
|
@ -41,6 +41,72 @@ static struct {
|
|||
struct omap_dss_output output;
|
||||
} sdi;
|
||||
|
||||
struct sdi_clk_calc_ctx {
|
||||
unsigned long pck_min, pck_max;
|
||||
|
||||
struct dss_clock_info dss_cinfo;
|
||||
struct dispc_clock_info dispc_cinfo;
|
||||
};
|
||||
|
||||
static bool dpi_calc_dispc_cb(int lckd, int pckd, unsigned long lck,
|
||||
unsigned long pck, void *data)
|
||||
{
|
||||
struct sdi_clk_calc_ctx *ctx = data;
|
||||
|
||||
ctx->dispc_cinfo.lck_div = lckd;
|
||||
ctx->dispc_cinfo.pck_div = pckd;
|
||||
ctx->dispc_cinfo.lck = lck;
|
||||
ctx->dispc_cinfo.pck = pck;
|
||||
|
||||
return true;
|
||||
}
|
||||
|
||||
static bool dpi_calc_dss_cb(int fckd, unsigned long fck, void *data)
|
||||
{
|
||||
struct sdi_clk_calc_ctx *ctx = data;
|
||||
|
||||
ctx->dss_cinfo.fck = fck;
|
||||
ctx->dss_cinfo.fck_div = fckd;
|
||||
|
||||
return dispc_div_calc(fck, ctx->pck_min, ctx->pck_max,
|
||||
dpi_calc_dispc_cb, ctx);
|
||||
}
|
||||
|
||||
static int sdi_calc_clock_div(unsigned long pclk,
|
||||
struct dss_clock_info *dss_cinfo,
|
||||
struct dispc_clock_info *dispc_cinfo)
|
||||
{
|
||||
int i;
|
||||
struct sdi_clk_calc_ctx ctx;
|
||||
|
||||
/*
|
||||
* DSS fclk gives us very few possibilities, so finding a good pixel
|
||||
* clock may not be possible. We try multiple times to find the clock,
|
||||
* each time widening the pixel clock range we look for, up to
|
||||
* +/- 1MHz.
|
||||
*/
|
||||
|
||||
for (i = 0; i < 10; ++i) {
|
||||
bool ok;
|
||||
|
||||
memset(&ctx, 0, sizeof(ctx));
|
||||
if (pclk > 1000 * i * i * i)
|
||||
ctx.pck_min = max(pclk - 1000 * i * i * i, 0lu);
|
||||
else
|
||||
ctx.pck_min = 0;
|
||||
ctx.pck_max = pclk + 1000 * i * i * i;
|
||||
|
||||
ok = dss_div_calc(ctx.pck_min, dpi_calc_dss_cb, &ctx);
|
||||
if (ok) {
|
||||
*dss_cinfo = ctx.dss_cinfo;
|
||||
*dispc_cinfo = ctx.dispc_cinfo;
|
||||
return 0;
|
||||
}
|
||||
}
|
||||
|
||||
return -EINVAL;
|
||||
}
|
||||
|
||||
static void sdi_config_lcd_manager(struct omap_dss_device *dssdev)
|
||||
{
|
||||
struct omap_overlay_manager *mgr = dssdev->output->manager;
|
||||
|
@ -88,7 +154,7 @@ int omapdss_sdi_display_enable(struct omap_dss_device *dssdev)
|
|||
t->data_pclk_edge = OMAPDSS_DRIVE_SIG_RISING_EDGE;
|
||||
t->sync_pclk_edge = OMAPDSS_DRIVE_SIG_RISING_EDGE;
|
||||
|
||||
r = dss_calc_clock_div(t->pixel_clock * 1000, &dss_cinfo, &dispc_cinfo);
|
||||
r = sdi_calc_clock_div(t->pixel_clock * 1000, &dss_cinfo, &dispc_cinfo);
|
||||
if (r)
|
||||
goto err_calc_clock_div;
|
||||
|
||||
|
|
Loading…
Reference in New Issue