diff options
| author | Ben Skeggs <skeggsb@gmail.com> | 2007-11-14 04:05:48 +1100 |
|---|---|---|
| committer | Ben Skeggs <skeggsb@gmail.com> | 2007-11-14 04:09:53 +1100 |
| commit | 7246a33dd104903bc9227628270712ea9e6168d8 (patch) | |
| tree | d31437290dd81fc7257a1437e57931fbfe834514 /shared-core/nouveau_dma.c | |
| parent | d0904f0f2b87c725d3e67060419c445259bd4a5e (diff) | |
nouveau: store user control reg offsets in channel struct
Diffstat (limited to 'shared-core/nouveau_dma.c')
| -rw-r--r-- | shared-core/nouveau_dma.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/shared-core/nouveau_dma.c b/shared-core/nouveau_dma.c index b406c22d..dff786d4 100644 --- a/shared-core/nouveau_dma.c +++ b/shared-core/nouveau_dma.c @@ -133,10 +133,10 @@ nouveau_dma_channel_takedown(struct drm_device *dev) #define RING_SKIPS 8 -#define READ_GET() ((NV_READ(NV03_FIFO_REGS_DMAGET(dchan->chan->id)) - \ - dchan->chan->pushbuf_base) >> 2) +#define READ_GET() ((NV_READ(dchan->chan->get) - \ + dchan->chan->pushbuf_base) >> 2) #define WRITE_PUT(val) do { \ - NV_WRITE(NV03_FIFO_REGS_DMAPUT(dchan->chan->id), \ + NV_WRITE(dchan->chan->put, \ ((val) << 2) + dchan->chan->pushbuf_base); \ } while(0) |