drm/nouveau/clk/gk20a: only compute n_lo if needed
authorAlexandre Courbot <acourbot@nvidia.com>
Fri, 12 Feb 2016 05:15:57 +0000 (14:15 +0900)
committerBen Skeggs <bskeggs@redhat.com>
Mon, 14 Mar 2016 00:13:53 +0000 (10:13 +1000)
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>
drivers/gpu/drm/nouveau/nvkm/subdev/clk/gk20a.c

index 96cb72f..e72e20a 100644 (file)
@@ -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;