From: Ben Skeggs Date: Mon, 4 Jan 2010 23:41:05 +0000 (+1000) Subject: drm/nv50: restore correct cache1 get/put address on fifoctx load X-Git-Tag: v2.6.33-rc6~27^2~11^2~21 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=7fb8ec8e2bedc8381243cf4bdc4cfa8e657397a8;p=profile%2Fivi%2Fkernel-x86-ivi.git drm/nv50: restore correct cache1 get/put address on fifoctx load Signed-off-by: Ben Skeggs --- diff --git a/drivers/gpu/drm/nouveau/nv50_fifo.c b/drivers/gpu/drm/nouveau/nv50_fifo.c index b728228..39caf16 100644 --- a/drivers/gpu/drm/nouveau/nv50_fifo.c +++ b/drivers/gpu/drm/nouveau/nv50_fifo.c @@ -384,8 +384,8 @@ nv50_fifo_load_context(struct nouveau_channel *chan) nv_wr32(dev, NV40_PFIFO_CACHE1_DATA(ptr), nv_ro32(dev, cache, (ptr * 2) + 1)); } - nv_wr32(dev, 0x3210, cnt << 2); - nv_wr32(dev, 0x3270, 0); + nv_wr32(dev, NV03_PFIFO_CACHE1_PUT, cnt << 2); + nv_wr32(dev, NV03_PFIFO_CACHE1_GET, 0); /* guessing that all the 0x34xx regs aren't on NV50 */ if (!IS_G80) { @@ -398,8 +398,6 @@ nv50_fifo_load_context(struct nouveau_channel *chan) 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)); return 0; }