From: Ben Skeggs Date: Sat, 19 Dec 2015 06:42:22 +0000 (+1000) Subject: drm/nouveau/ltc/gm107: use nvkm_mask to set cbc_ctrl1 X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=4fb9c3f3e56c92a914db4fea39f3c302e3c786c3;p=GitHub%2FLineageOS%2Fandroid_kernel_motorola_exynos9610.git 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 --- 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