diff options
| author | Ben Skeggs <bskeggs@redhat.com> | 2015-01-27 15:44:06 +1000 |
|---|---|---|
| committer | Ben Skeggs <bskeggs@redhat.com> | 2015-03-17 09:35:50 +1000 |
| commit | 8267ede7214e062b2226c06f35b7eda5d63c6d17 (patch) | |
| tree | 720f48b9f06f06dfea7f242ecd887d280cd63d1e /drm/nouveau | |
| parent | 1e24ad3eafae56792c83d3c8fbb8a46e3a2e476f (diff) | |
| download | nouveau-8267ede7214e062b2226c06f35b7eda5d63c6d17.tar.gz | |
gr/gf100: fix some accidental or'ing of buffer addresses
fdo#83992
Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
Diffstat (limited to 'drm/nouveau')
| -rw-r--r-- | drm/nouveau/nvkm/engine/gr/ctxgf100.c | 4 | ||||
| -rw-r--r-- | drm/nouveau/nvkm/engine/gr/ctxgk104.c | 4 | ||||
| -rw-r--r-- | drm/nouveau/nvkm/engine/gr/ctxgm107.c | 4 |
3 files changed, 6 insertions, 6 deletions
diff --git a/drm/nouveau/nvkm/engine/gr/ctxgf100.c b/drm/nouveau/nvkm/engine/gr/ctxgf100.c index 2e7ec389e..57e2c5b13 100644 --- a/drm/nouveau/nvkm/engine/gr/ctxgf100.c +++ b/drm/nouveau/nvkm/engine/gr/ctxgf100.c @@ -1032,9 +1032,9 @@ gf100_grctx_generate_bundle(struct gf100_grctx *info) const int s = 8; const int b = mmio_vram(info, impl->bundle_size, (1 << s), access); mmio_refn(info, 0x408004, 0x00000000, s, b); - mmio_refn(info, 0x408008, 0x80000000 | (impl->bundle_size >> s), 0, b); + mmio_wr32(info, 0x408008, 0x80000000 | (impl->bundle_size >> s)); mmio_refn(info, 0x418808, 0x00000000, s, b); - mmio_refn(info, 0x41880c, 0x80000000 | (impl->bundle_size >> s), 0, b); + mmio_wr32(info, 0x41880c, 0x80000000 | (impl->bundle_size >> s)); } void diff --git a/drm/nouveau/nvkm/engine/gr/ctxgk104.c b/drm/nouveau/nvkm/engine/gr/ctxgk104.c index b52300d88..5e9454ba1 100644 --- a/drm/nouveau/nvkm/engine/gr/ctxgk104.c +++ b/drm/nouveau/nvkm/engine/gr/ctxgk104.c @@ -851,9 +851,9 @@ gk104_grctx_generate_bundle(struct gf100_grctx *info) const int s = 8; const int b = mmio_vram(info, impl->bundle_size, (1 << s), access); mmio_refn(info, 0x408004, 0x00000000, s, b); - mmio_refn(info, 0x408008, 0x80000000 | (impl->bundle_size >> s), 0, b); + mmio_wr32(info, 0x408008, 0x80000000 | (impl->bundle_size >> s)); mmio_refn(info, 0x418808, 0x00000000, s, b); - mmio_refn(info, 0x41880c, 0x80000000 | (impl->bundle_size >> s), 0, b); + mmio_wr32(info, 0x41880c, 0x80000000 | (impl->bundle_size >> s)); mmio_wr32(info, 0x4064c8, (state_limit << 16) | token_limit); } diff --git a/drm/nouveau/nvkm/engine/gr/ctxgm107.c b/drm/nouveau/nvkm/engine/gr/ctxgm107.c index 956f4dce9..b2fae6e38 100644 --- a/drm/nouveau/nvkm/engine/gr/ctxgm107.c +++ b/drm/nouveau/nvkm/engine/gr/ctxgm107.c @@ -871,9 +871,9 @@ gm107_grctx_generate_bundle(struct gf100_grctx *info) const int s = 8; const int b = mmio_vram(info, impl->bundle_size, (1 << s), access); mmio_refn(info, 0x408004, 0x00000000, s, b); - mmio_refn(info, 0x408008, 0x80000000 | (impl->bundle_size >> s), 0, b); + mmio_wr32(info, 0x408008, 0x80000000 | (impl->bundle_size >> s)); mmio_refn(info, 0x418e24, 0x00000000, s, b); - mmio_refn(info, 0x418e28, 0x80000000 | (impl->bundle_size >> s), 0, b); + mmio_wr32(info, 0x418e28, 0x80000000 | (impl->bundle_size >> s)); mmio_wr32(info, 0x4064c8, (state_limit << 16) | token_limit); } |