diff options
| author | Ben Skeggs <skeggsb@gmail.com> | 2007-06-25 15:42:55 +1000 |
|---|---|---|
| committer | Ben Skeggs <skeggsb@gmail.com> | 2007-06-28 03:26:44 +1000 |
| commit | 68ecf61647e9ec16d59cc8f50550d11478eb3118 (patch) | |
| tree | 1b1be7d1eb47541c87545013e1405a6925b3013e /shared-core/nv04_fifo.c | |
| parent | 18a6d1c9c380b6b19524f654d9173a79e19aa1df (diff) | |
nouveau: never touch PRAMIN with NV_WRITE, cleanup RAMHT code a bit
Diffstat (limited to 'shared-core/nv04_fifo.c')
| -rw-r--r-- | shared-core/nv04_fifo.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/shared-core/nv04_fifo.c b/shared-core/nv04_fifo.c index 783514a7..57010182 100644 --- a/shared-core/nv04_fifo.c +++ b/shared-core/nv04_fifo.c @@ -28,9 +28,9 @@ #include "drm.h" #include "nouveau_drv.h" -#define NV04_RAMFC (NV_RAMIN + dev_priv->ramfc_offset) -#define RAMFC_WR(offset, val) NV_WRITE(fifoctx + NV04_RAMFC_##offset, (val)) -#define RAMFC_RD(offset) NV_READ(fifoctx + NV04_RAMFC_##offset) +#define NV04_RAMFC dev_priv->ramfc_offset +#define RAMFC_WR(offset, val) NV_WI32(fifoctx + NV04_RAMFC_##offset, (val)) +#define RAMFC_RD(offset) NV_RI32(fifoctx + NV04_RAMFC_##offset) #define NV04_FIFO_CONTEXT_SIZE 32 int @@ -47,7 +47,7 @@ nv04_fifo_create_context(drm_device_t *dev, int channel) /* Clear RAMFC */ for (i=0; i<NV04_FIFO_CONTEXT_SIZE; i+=4) - NV_WRITE(fifoctx + i, 0); + NV_WI32(fifoctx + i, 0); /* Setup initial state */ RAMFC_WR(DMA_PUT, chan->pushbuf_base); @@ -72,7 +72,7 @@ nv04_fifo_destroy_context(drm_device_t *dev, int channel) fifoctx = NV04_RAMFC + (channel * NV04_FIFO_CONTEXT_SIZE); for (i=0; i<NV04_FIFO_CONTEXT_SIZE; i+=4) - NV_WRITE(fifoctx + i, 0); + NV_WI32(fifoctx + i, 0); } int |