Skip to content

L
linux-davinci
Commit a908b96c authored by Ben Skeggs's avatar Ben Skeggs Committed by Dave Airlie
Browse files
Options

drm/nv50: restore correct cache1 get/put address on fifoctx load 

Signed-off-by: default avatarBen Skeggs <bskeggs@redhat.com>
parent c03ec7f9
Hide whitespace changes
Inline Side-by-side
Showing with 2 additions and 4 deletions
drivers/gpu/drm/nouveau/nv50_fifo.c
View file @ a908b96c
...@@ -384,8 +384,8 @@ nv50_fifo_load_context(struct nouveau_channel *chan) ...@@ -384,8 +384,8 @@ nv50_fifo_load_context(struct nouveau_channel *chan)
nv_wr32(dev, NV40_PFIFO_CACHE1_DATA(ptr), nv_wr32(dev, NV40_PFIFO_CACHE1_DATA(ptr),
nv_ro32(dev, cache, (ptr * 2) + 1)); nv_ro32(dev, cache, (ptr * 2) + 1));
} }
nv_wr32(dev, 0x3210, cnt << 2); nv_wr32(dev, NV03_PFIFO_CACHE1_PUT, cnt << 2);
nv_wr32(dev, 0x3270, 0); nv_wr32(dev, NV03_PFIFO_CACHE1_GET, 0);
/* guessing that all the 0x34xx regs aren't on NV50 */ /* guessing that all the 0x34xx regs aren't on NV50 */
if (!IS_G80) { if (!IS_G80) {
...@@ -398,8 +398,6 @@ nv50_fifo_load_context(struct nouveau_channel *chan) ...@@ -398,8 +398,6 @@ nv50_fifo_load_context(struct nouveau_channel *chan)
dev_priv->engine.instmem.finish_access(dev); dev_priv->engine.instmem.finish_access(dev);
nv_wr32(dev, NV03_PFIFO_CACHE1_GET, 0);
nv_wr32(dev, NV03_PFIFO_CACHE1_PUT, 0);
nv_wr32(dev, NV03_PFIFO_CACHE1_PUSH1, chan->id | (1<<16)); nv_wr32(dev, NV03_PFIFO_CACHE1_PUSH1, chan->id | (1<<16));
return 0; return 0;
} }
......
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