diff options
| author | Ben Skeggs <bskeggs@redhat.com> | 2013-05-07 15:54:13 +1000 |
|---|---|---|
| committer | Ben Skeggs <bskeggs@redhat.com> | 2013-05-20 13:23:42 +1000 |
| commit | 46b47b8a7d9223b12ddcabf1f3fc6e753e2d84a1 (patch) | |
| tree | b33b28f03d8802a1e570a34fe387c3527b0e771c /drivers/gpu/drm | |
| parent | c5e624f8437331e1d985b4bb5efe3c4229569550 (diff) | |
| download | blackbird-op-linux-46b47b8a7d9223b12ddcabf1f3fc6e753e2d84a1.tar.gz blackbird-op-linux-46b47b8a7d9223b12ddcabf1f3fc6e753e2d84a1.zip | |
drm/nouveau/bios: fix thinko in ZM_MASK_ADD opcode
Cc: stable@vger.kernel.org
Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
Diffstat (limited to 'drivers/gpu/drm')
| -rw-r--r-- | drivers/gpu/drm/nouveau/core/subdev/bios/init.c | 4 |
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 c300b5e7b670..c434d398d16f 100644 --- a/drivers/gpu/drm/nouveau/core/subdev/bios/init.c +++ b/drivers/gpu/drm/nouveau/core/subdev/bios/init.c @@ -1940,8 +1940,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); } |
