projects
/
openwrt
/
staging
/
blogic.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
c5e624f
)
drm/nouveau/bios: fix thinko in ZM_MASK_ADD opcode
author
Ben Skeggs
<bskeggs@redhat.com>
Tue, 7 May 2013 05:54:13 +0000
(15:54 +1000)
committer
Ben Skeggs
<bskeggs@redhat.com>
Mon, 20 May 2013 03:23:42 +0000
(13:23 +1000)
Cc: stable@vger.kernel.org
Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
drivers/gpu/drm/nouveau/core/subdev/bios/init.c
patch
|
blob
|
history
diff --git
a/drivers/gpu/drm/nouveau/core/subdev/bios/init.c
b/drivers/gpu/drm/nouveau/core/subdev/bios/init.c
index c300b5e7b67048550c4d019bc94b31dc9c0ac6a9..c434d398d16f0302bec862c95b6421cb8e505652 100644
(file)
--- 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);
}