OSDN Git Service

drm/nouveau/clk/gk20a: fix VCO bit mask
authorAlexandre Courbot <acourbot@nvidia.com>
Fri, 12 Feb 2016 05:13:21 +0000 (14:13 +0900)
committerBen Skeggs <bskeggs@redhat.com>
Mon, 14 Mar 2016 00:13:52 +0000 (10:13 +1000)
Fix the mask specified to switch to VCO mode was given as an (incorrect)
immediate value. Although the side-effect happens to be the same, this
is clearly incorrect.

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 b5a92f7..96cb72f 100644 (file)
@@ -422,7 +422,8 @@ _gk20a_pllg_program_mnp(struct gk20a_clk *clk, bool allow_slide)
                return -ETIMEDOUT;
 
        /* switch to VCO mode */
-       nvkm_mask(device, SEL_VCO, 0, BIT(SEL_VCO_GPC2CLK_OUT_SHIFT));
+       nvkm_mask(device, SEL_VCO, BIT(SEL_VCO_GPC2CLK_OUT_SHIFT),
+                 BIT(SEL_VCO_GPC2CLK_OUT_SHIFT));
 
        /* restore out divider 1:1 */
        val = nvkm_rd32(device, GPC2CLK_OUT);