aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBen Skeggs <bskeggs@redhat.com>2015-12-19 16:42:22 +1000
committerBen Skeggs <bskeggs@redhat.com>2016-01-11 11:28:21 +1000
commit4fb9c3f3e56c92a914db4fea39f3c302e3c786c3 (patch)
tree2dba88c0f4f3935a7e498c707d996e29ea55baaf
parentdrm/nouveau/ibus/gm204: split implementation from gk104 (diff)
downloadlinux-dev-4fb9c3f3e56c92a914db4fea39f3c302e3c786c3.tar.xz
linux-dev-4fb9c3f3e56c92a914db4fea39f3c302e3c786c3.zip
drm/nouveau/ltc/gm107: use nvkm_mask to set cbc_ctrl1
resman and nvgpu both do this, presumably for good reason. Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
-rw-r--r--drivers/gpu/drm/nouveau/nvkm/subdev/ltc/gm107.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/gpu/drm/nouveau/nvkm/subdev/ltc/gm107.c b/drivers/gpu/drm/nouveau/nvkm/subdev/ltc/gm107.c
index 3043bbfd7384..54d0a42c558d 100644
--- a/drivers/gpu/drm/nouveau/nvkm/subdev/ltc/gm107.c
+++ b/drivers/gpu/drm/nouveau/nvkm/subdev/ltc/gm107.c
@@ -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