drm/nouveau/ltc/gm107: use nvkm_mask to set cbc_ctrl1
authorBen Skeggs <bskeggs@redhat.com>
Sat, 19 Dec 2015 06:42:22 +0000 (16:42 +1000)
committerBen Skeggs <bskeggs@redhat.com>
Mon, 11 Jan 2016 01:28:21 +0000 (11:28 +1000)
resman and nvgpu both do this, presumably for good reason.

Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
drivers/gpu/drm/nouveau/nvkm/subdev/ltc/gm107.c

index 3043bbfd7384460691cb42db41dddaf2f50bfc62..54d0a42c558d07752bb12ddf519684cb30e28954 100644 (file)
@@ -32,7 +32,7 @@ gm107_ltc_cbc_clear(struct nvkm_ltc *ltc, u32 start, u32 limit)
        struct nvkm_device *device = ltc->subdev.device;
        nvkm_wr32(device, 0x17e270, start);
        nvkm_wr32(device, 0x17e274, limit);
-       nvkm_wr32(device, 0x17e26c, 0x00000004);
+       nvkm_mask(device, 0x17e26c, 0x00000000, 0x00000004);
 }
 
 static void