Commit afea21c9 authored by Alexandre Courbot's avatar Alexandre Courbot Committed by Ben Skeggs

drm/nouveau/clk/gk20a: factorize n_lo computation code

Use a dedicated function instead of always calculating n_lo on the fly.
Signed-off-by: default avatarAlexandre Courbot <acourbot@nvidia.com>
Signed-off-by: default avatarBen Skeggs <bskeggs@redhat.com>
parent 89d3a912
...@@ -160,6 +160,13 @@ gk20a_pllg_calc_rate(struct gk20a_clk *clk, struct gk20a_pll *pll) ...@@ -160,6 +160,13 @@ gk20a_pllg_calc_rate(struct gk20a_clk *clk, struct gk20a_pll *pll)
return rate / divider / 2; return rate / divider / 2;
} }
static u32
gk20a_pllg_n_lo(struct gk20a_clk *clk, struct gk20a_pll *pll)
{
return DIV_ROUND_UP(pll->m * clk->params->min_vco,
clk->parent_rate / KHZ);
}
static int static int
gk20a_pllg_calc_mnp(struct gk20a_clk *clk, unsigned long rate, gk20a_pllg_calc_mnp(struct gk20a_clk *clk, unsigned long rate,
struct gk20a_pll *pll) struct gk20a_pll *pll)
...@@ -341,7 +348,6 @@ _gk20a_pllg_program_mnp(struct gk20a_clk *clk, struct gk20a_pll *pll, ...@@ -341,7 +348,6 @@ _gk20a_pllg_program_mnp(struct gk20a_clk *clk, struct gk20a_pll *pll,
struct nvkm_device *device = subdev->device; struct nvkm_device *device = subdev->device;
u32 val, cfg; u32 val, cfg;
struct gk20a_pll old_pll; struct gk20a_pll old_pll;
u32 n_lo;
/* get old coefficients */ /* get old coefficients */
gk20a_pllg_read_mnp(clk, &old_pll); gk20a_pllg_read_mnp(clk, &old_pll);
...@@ -357,10 +363,7 @@ _gk20a_pllg_program_mnp(struct gk20a_clk *clk, struct gk20a_pll *pll, ...@@ -357,10 +363,7 @@ _gk20a_pllg_program_mnp(struct gk20a_clk *clk, struct gk20a_pll *pll,
if (allow_slide && (cfg & GPCPLL_CFG_ENABLE)) { if (allow_slide && (cfg & GPCPLL_CFG_ENABLE)) {
int ret; int ret;
n_lo = DIV_ROUND_UP(old_pll.m * clk->params->min_vco, ret = gk20a_pllg_slide(clk, gk20a_pllg_n_lo(clk, &old_pll));
clk->parent_rate / KHZ);
ret = gk20a_pllg_slide(clk, n_lo);
if (ret) if (ret)
return ret; return ret;
} }
...@@ -391,8 +394,7 @@ _gk20a_pllg_program_mnp(struct gk20a_clk *clk, struct gk20a_pll *pll, ...@@ -391,8 +394,7 @@ _gk20a_pllg_program_mnp(struct gk20a_clk *clk, struct gk20a_pll *pll,
old_pll = *pll; old_pll = *pll;
if (allow_slide) if (allow_slide)
old_pll.n = DIV_ROUND_UP(pll->m * clk->params->min_vco, old_pll.n = gk20a_pllg_n_lo(clk, pll);
clk->parent_rate / KHZ);
gk20a_pllg_write_mnp(clk, &old_pll); gk20a_pllg_write_mnp(clk, &old_pll);
gk20a_pllg_enable(clk); gk20a_pllg_enable(clk);
...@@ -628,8 +630,7 @@ gk20a_clk_fini(struct nvkm_clk *base) ...@@ -628,8 +630,7 @@ gk20a_clk_fini(struct nvkm_clk *base)
u32 n_lo; u32 n_lo;
gk20a_pllg_read_mnp(clk, &pll); gk20a_pllg_read_mnp(clk, &pll);
n_lo = DIV_ROUND_UP(pll.m * clk->params->min_vco, n_lo = gk20a_pllg_n_lo(clk, &pll);
clk->parent_rate / KHZ);
gk20a_pllg_slide(clk, n_lo); gk20a_pllg_slide(clk, n_lo);
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment