aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBen Skeggs <bskeggs@redhat.com>2013-05-07 15:54:13 +1000
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2013-05-24 11:36:03 -0700
commit429d8945a2cc016ebb0c732c12e4356704f03685 (patch)
treeaa961472e8adb7753b9a6c84ad60b9d2dbf110b1
parentda9d83cf6e1f64c5dafc7c47f6ce93788bc1263a (diff)
downloadvexpress-lsk-429d8945a2cc016ebb0c732c12e4356704f03685.tar.gz
drm/nouveau/bios: fix thinko in ZM_MASK_ADD opcode
commit 46b47b8a7d9223b12ddcabf1f3fc6e753e2d84a1 upstream. Signed-off-by: Ben Skeggs <bskeggs@redhat.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
-rw-r--r--drivers/gpu/drm/nouveau/core/subdev/bios/init.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/gpu/drm/nouveau/core/subdev/bios/init.c b/drivers/gpu/drm/nouveau/core/subdev/bios/init.c
index 9c41b58d57e..ad6335f3f1f 100644
--- a/drivers/gpu/drm/nouveau/core/subdev/bios/init.c
+++ b/drivers/gpu/drm/nouveau/core/subdev/bios/init.c
@@ -1926,8 +1926,8 @@ init_zm_mask_add(struct nvbios_init *init)
trace("ZM_MASK_ADD\tR[0x%06x] &= 0x%08x += 0x%08x\n", addr, mask, add);
init->offset += 13;
- data = init_rd32(init, addr) & mask;
- data |= ((data + add) & ~mask);
+ data = init_rd32(init, addr);
+ data = (data & mask) | ((data + add) & ~mask);
init_wr32(init, addr, data);
}