diff options
author | Ben Skeggs <skeggsb@gmail.com> | 2007-11-14 05:09:07 +1100 |
---|---|---|
committer | Ben Skeggs <skeggsb@gmail.com> | 2007-11-14 05:09:07 +1100 |
commit | eb5487b9ca1d7ce60d5ddc784089d91cf176f439 (patch) | |
tree | 55309717d95b69223a6c1c815286196c47ccd70c /shared-core/nouveau_dma.c | |
parent | 2370ded79b4176d76cda1ec5f495fd33c2d566ed (diff) | |
parent | 7c1e59fb0c5043d3d369f5feb8e195a6a3da3457 (diff) |
Merge branch 'fifo-cleanup' into upstream-master
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) |