mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/herbert/cryptodev-2.6.git
synced 2026-04-27 03:49:57 -04:00
drm: omapdrm: dispc: Pass DISPC pointer to remaining dispc API functions
This removes the need to access the global DISPC private data in those functions (both for the current accesses and the future ones that will be introduced when allocating the DISPC private data dynamically). Signed-off-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com> Reviewed-by: Sebastian Reichel <sebastian.reichel@collabora.co.uk>
This commit is contained in:
committed by
Tomi Valkeinen
parent
50638ae569
commit
8a7eda7686
@@ -191,8 +191,9 @@ static bool dpi_calc_hsdiv_cb(int m_dispc, unsigned long dispc,
|
||||
ctx->pll_cinfo.mX[ctx->clkout_idx] = m_dispc;
|
||||
ctx->pll_cinfo.clkout[ctx->clkout_idx] = dispc;
|
||||
|
||||
return dispc_div_calc(dispc, ctx->pck_min, ctx->pck_max,
|
||||
dpi_calc_dispc_cb, ctx);
|
||||
return dispc_div_calc(ctx->pll->dss->dispc, dispc,
|
||||
ctx->pck_min, ctx->pck_max,
|
||||
dpi_calc_dispc_cb, ctx);
|
||||
}
|
||||
|
||||
|
||||
@@ -218,8 +219,9 @@ static bool dpi_calc_dss_cb(unsigned long fck, void *data)
|
||||
|
||||
ctx->fck = fck;
|
||||
|
||||
return dispc_div_calc(fck, ctx->pck_min, ctx->pck_max,
|
||||
dpi_calc_dispc_cb, ctx);
|
||||
return dispc_div_calc(ctx->pll->dss->dispc, fck,
|
||||
ctx->pck_min, ctx->pck_max,
|
||||
dpi_calc_dispc_cb, ctx);
|
||||
}
|
||||
|
||||
static bool dpi_pll_clk_calc(struct dpi_data *dpi, unsigned long pck,
|
||||
@@ -514,7 +516,7 @@ static int dpi_check_timings(struct omap_dss_device *dssdev,
|
||||
if (vm->hactive % 8 != 0)
|
||||
return -EINVAL;
|
||||
|
||||
if (!dispc_mgr_timings_ok(channel, vm))
|
||||
if (!dispc_mgr_timings_ok(dpi->dss->dispc, channel, vm))
|
||||
return -EINVAL;
|
||||
|
||||
if (vm->pixelclock == 0)
|
||||
|
||||
Reference in New Issue
Block a user