Commit 429d8945 authored by Ben Skeggs's avatar Ben Skeggs Committed by Greg Kroah-Hartman

drm/nouveau/bios: fix thinko in ZM_MASK_ADD opcode

commit 46b47b8a upstream.
Signed-off-by: default avatarBen Skeggs <bskeggs@redhat.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent da9d83cf
...@@ -1926,8 +1926,8 @@ init_zm_mask_add(struct nvbios_init *init) ...@@ -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); trace("ZM_MASK_ADD\tR[0x%06x] &= 0x%08x += 0x%08x\n", addr, mask, add);
init->offset += 13; init->offset += 13;
data = init_rd32(init, addr) & mask; data = init_rd32(init, addr);
data |= ((data + add) & ~mask); data = (data & mask) | ((data + add) & ~mask);
init_wr32(init, addr, data); init_wr32(init, addr, data);
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment