drm/nouveau/nvkm: add/remove 0's to make 7 (or 9)-nibble constants use 8 nibbles

Signed-off-by: Ilia Mirkin <imirkin@alum.mit.edu>
Signed-off-by: Ben Skeggs <bskeggs@redhat.com>

diff --git a/drivers/gpu/drm/nouveau/nvkm/engine/gr/ctxgk20a.c b/drivers/gpu/drm/nouveau/nvkm/engine/gr/ctxgk20a.c
index ddaa16a71c84dd7fabefd11fc2b88e69ef5796f9..ad0a6cfe7580d97a205882e07ed82d5882ef8efd 100644 (file)
--- a/drivers/gpu/drm/nouveau/nvkm/engine/gr/ctxgk20a.c
+++ b/drivers/gpu/drm/nouveau/nvkm/engine/gr/ctxgk20a.c
@@ -55,7 +55,7 @@ gk20a_grctx_generate_main(struct gf100_gr *gr, struct gf100_grctx *info)
 
        gk104_grctx_generate_rop_active_fbps(gr);
 
-       nvkm_mask(device, 0x5044b0, 0x8000000, 0x8000000);
+       nvkm_mask(device, 0x5044b0, 0x08000000, 0x08000000);
 
        gf100_gr_wait_idle(gr);
 

diff --git a/drivers/gpu/drm/nouveau/nvkm/subdev/fb/ramgk104.c b/drivers/gpu/drm/nouveau/nvkm/subdev/fb/ramgk104.c
index 9df45030ff9fb454485ef0f8efc5df07757b1bb2..1fa3ade468ae95783ae14aee88a223279e4d397b 100644 (file)
--- a/drivers/gpu/drm/nouveau/nvkm/subdev/fb/ramgk104.c
+++ b/drivers/gpu/drm/nouveau/nvkm/subdev/fb/ramgk104.c
@@ -216,11 +216,11 @@ r1373f4_fini(struct gk104_ramfuc *fuc)
        ram_wr32(fuc, 0x1373ec, tmp | (v1 << 16));
        ram_mask(fuc, 0x1373f0, (~ram->mode & 3), 0x00000000);
        if (ram->mode == 2) {
-               ram_mask(fuc, 0x1373f4, 0x00000003, 0x000000002);
-               ram_mask(fuc, 0x1373f4, 0x00001100, 0x000000000);
+               ram_mask(fuc, 0x1373f4, 0x00000003, 0x00000002);
+               ram_mask(fuc, 0x1373f4, 0x00001100, 0x00000000);
        } else {
-               ram_mask(fuc, 0x1373f4, 0x00000003, 0x000000001);
-               ram_mask(fuc, 0x1373f4, 0x00010000, 0x000000000);
+               ram_mask(fuc, 0x1373f4, 0x00000003, 0x00000001);
+               ram_mask(fuc, 0x1373f4, 0x00010000, 0x00000000);
        }
        ram_mask(fuc, 0x10f800, 0x00000030, (v0 ^ v1) << 4);
 }

diff --git a/drivers/gpu/drm/nouveau/nvkm/subdev/therm/nv40.c b/drivers/gpu/drm/nouveau/nvkm/subdev/therm/nv40.c
index 6326fdc5a48d37224085091076f236fcc7fcab4f..2c92ffb5f9d0623dd850d42c202110173ac2647e 100644 (file)
--- a/drivers/gpu/drm/nouveau/nvkm/subdev/therm/nv40.c
+++ b/drivers/gpu/drm/nouveau/nvkm/subdev/therm/nv40.c
@@ -107,7 +107,7 @@ nv40_fan_pwm_ctrl(struct nvkm_therm *therm, int line, bool enable)
 {
        struct nvkm_subdev *subdev = &therm->subdev;
        struct nvkm_device *device = subdev->device;
-       u32 mask = enable ? 0x80000000 : 0x0000000;
+       u32 mask = enable ? 0x80000000 : 0x00000000;
        if      (line == 2) nvkm_mask(device, 0x0010f0, 0x80000000, mask);
        else if (line == 9) nvkm_mask(device, 0x0015f4, 0x80000000, mask);
        else {