diff options
| author | Alexandre Courbot | 2016-02-12 06:15:57 +0100 |
|---|---|---|
| committer | Ben Skeggs | 2016-03-14 01:13:53 +0100 |
| commit | a08c8bae66eb42a901410e43fd48bac8948bd2da (patch) | |
| tree | 02ce8627f3db1428576cb5d9b10577fb34e3b24e | |
| parent | drm/nouveau/clk/gk20a: fix VCO bit mask (diff) | |
| download | kernel-qcow2-linux-a08c8bae66eb42a901410e43fd48bac8948bd2da.tar.gz kernel-qcow2-linux-a08c8bae66eb42a901410e43fd48bac8948bd2da.tar.xz kernel-qcow2-linux-a08c8bae66eb42a901410e43fd48bac8948bd2da.zip | |
drm/nouveau/clk/gk20a: only compute n_lo if needed
n_lo is used if we are going to slide. Compute it only if that condition
succeeds to avoid confusion about future usage of this computation.
Signed-off-by: Alexandre Courbot <acourbot@nvidia.com>
Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
| -rw-r--r-- | drivers/gpu/drm/nouveau/nvkm/subdev/clk/gk20a.c | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/drivers/gpu/drm/nouveau/nvkm/subdev/clk/gk20a.c b/drivers/gpu/drm/nouveau/nvkm/subdev/clk/gk20a.c index 96cb72fdb323..e72e20a0d009 100644 --- a/drivers/gpu/drm/nouveau/nvkm/subdev/clk/gk20a.c +++ b/drivers/gpu/drm/nouveau/nvkm/subdev/clk/gk20a.c @@ -367,10 +367,12 @@ _gk20a_pllg_program_mnp(struct gk20a_clk *clk, bool allow_slide) } /* slide down to NDIV_LO */ - n_lo = DIV_ROUND_UP(m_old * clk->params->min_vco, - clk->parent_rate / KHZ); if (allow_slide && (cfg & GPCPLL_CFG_ENABLE)) { - int ret = gk20a_pllg_slide(clk, n_lo); + int ret; + + n_lo = DIV_ROUND_UP(m_old * clk->params->min_vco, + clk->parent_rate / KHZ); + ret = gk20a_pllg_slide(clk, n_lo); if (ret) return ret; |