diff options
| author | Alexandre Courbot | 2016-02-12 06:13:21 +0100 |
|---|---|---|
| committer | Ben Skeggs | 2016-03-14 01:13:52 +0100 |
| commit | 3a91b9c5efd27729767edfde9df069aa61c4816f (patch) | |
| tree | 16e86e65f6cf01add043869870b0507c120e96f1 | |
| parent | drm/nouveau/clk/gk20a: rename enable/disable functions (diff) | |
| download | kernel-qcow2-linux-3a91b9c5efd27729767edfde9df069aa61c4816f.tar.gz kernel-qcow2-linux-3a91b9c5efd27729767edfde9df069aa61c4816f.tar.xz kernel-qcow2-linux-3a91b9c5efd27729767edfde9df069aa61c4816f.zip | |
drm/nouveau/clk/gk20a: fix VCO bit mask
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>
| -rw-r--r-- | drivers/gpu/drm/nouveau/nvkm/subdev/clk/gk20a.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/gpu/drm/nouveau/nvkm/subdev/clk/gk20a.c b/drivers/gpu/drm/nouveau/nvkm/subdev/clk/gk20a.c index b5a92f766a54..96cb72fdb323 100644 --- a/drivers/gpu/drm/nouveau/nvkm/subdev/clk/gk20a.c +++ b/drivers/gpu/drm/nouveau/nvkm/subdev/clk/gk20a.c @@ -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); |