From: <st...@ke...> - 2008-07-29 01:38:44
|
shared-core/nouveau_fifo.c | 2 +- shared-core/nv04_fifo.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) New commits: commit 6b903f5edfbba19980a5518df9a89643378516d4 Author: Stuart Bennett <sb...@ca...> Date: Tue Jul 29 02:32:13 2008 +0100 nouveau: fix nv04 fifo context save to save reg contents, not reg offset clearly the function had never been used :) diff --git a/shared-core/nv04_fifo.c b/shared-core/nv04_fifo.c index 230c8e7..88186fe 100644 --- a/shared-core/nv04_fifo.c +++ b/shared-core/nv04_fifo.c @@ -122,8 +122,8 @@ nv04_fifo_save_context(struct nouveau_channel *chan) struct drm_nouveau_private *dev_priv = dev->dev_private; uint32_t tmp; - RAMFC_WR(DMA_PUT, NV04_PFIFO_CACHE1_DMA_PUT); - RAMFC_WR(DMA_GET, NV04_PFIFO_CACHE1_DMA_GET); + RAMFC_WR(DMA_PUT, NV_READ(NV04_PFIFO_CACHE1_DMA_PUT)); + RAMFC_WR(DMA_GET, NV_READ(NV04_PFIFO_CACHE1_DMA_GET)); tmp = NV_READ(NV04_PFIFO_CACHE1_DMA_DCOUNT) << 16; tmp |= NV_READ(NV04_PFIFO_CACHE1_DMA_INSTANCE); commit 591f6bcba35e482280299eef91d57b23a69106d1 Author: Stuart Bennett <sb...@ca...> Date: Tue Jul 29 02:26:34 2008 +0100 nouveau: fix bad rename from 5a072f32c8f941d1ef301811881e8c89c8d8a5f1 diff --git a/shared-core/nouveau_fifo.c b/shared-core/nouveau_fifo.c index 085336a..5ec2bc3 100644 --- a/shared-core/nouveau_fifo.c +++ b/shared-core/nouveau_fifo.c @@ -131,7 +131,7 @@ int nouveau_fifo_init(struct drm_device *dev) /* No cmdbuf object */ NV_WRITE(NV04_PFIFO_CACHE1_DMA_INSTANCE, 0x00000000); NV_WRITE(NV03_PFIFO_CACHE0_PUSH0, 0x00000000); - NV_WRITE(NV03_PFIFO_CACHE0_PULL0, 0x00000000); + NV_WRITE(NV04_PFIFO_CACHE0_PULL0, 0x00000000); NV_WRITE(NV04_PFIFO_SIZE, 0x0000FFFF); NV_WRITE(NV04_PFIFO_CACHE1_HASH, 0x0000FFFF); NV_WRITE(NV04_PFIFO_CACHE0_PULL1, 0x00000001); |