git.samba.org
/
sfrench
/
cifs-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge remote-tracking branches 'asoc/fix/rt5663', 'asoc/fix/rt5665', 'asoc/fix/samsun...
[sfrench/cifs-2.6.git]
/
drivers
/
gpu
/
drm
/
nouveau
/
nvkm
/
subdev
/
bar
/
gf100.c
diff --git
a/drivers/gpu/drm/nouveau/nvkm/subdev/bar/gf100.c
b/drivers/gpu/drm/nouveau/nvkm/subdev/bar/gf100.c
index c794b2c2d21e710faa3ac64f70ac970ae69826c9..6d8f21290aa20342c1d50f73aa836feab1266d8c 100644
(file)
--- a/
drivers/gpu/drm/nouveau/nvkm/subdev/bar/gf100.c
+++ b/
drivers/gpu/drm/nouveau/nvkm/subdev/bar/gf100.c
@@
-129,7
+129,7
@@
gf100_bar_init(struct nvkm_bar *base)
if (bar->bar[0].mem) {
addr = nvkm_memory_addr(bar->bar[0].mem) >> 12;
- nvkm_wr32(device, 0x001714, 0x
c
0000000 | addr);
+ nvkm_wr32(device, 0x001714, 0x
8
0000000 | addr);
}
return 0;