diff options
author | Ben Skeggs <darktama@iinet.net.au> | 2006-11-02 01:18:14 +1100 |
---|---|---|
committer | Ben Skeggs <darktama@iinet.net.au> | 2006-11-02 01:18:14 +1100 |
commit | 6a77e5bf2e58b19df67c029ad7bffd92f8cf652f (patch) | |
tree | 9af132aa0e99e1c09651e090f97aa34ee042c7a5 /src/nv_dma.h | |
parent | 1d6e911ab5391277b403ef6f7b095203cfd19a53 (diff) | |
download | xorg-driver-xf86-video-nouveau-6a77e5bf2e58b19df67c029ad7bffd92f8cf652f.tar.gz |
First part of preparation for NV30_TCL EXA code merge.
Diffstat (limited to 'src/nv_dma.h')
-rw-r--r-- | src/nv_dma.h | 44 |
1 files changed, 23 insertions, 21 deletions
diff --git a/src/nv_dma.h b/src/nv_dma.h index 115b57a..a21d404 100644 --- a/src/nv_dma.h +++ b/src/nv_dma.h @@ -60,34 +60,36 @@ #define NV_DMA_CONTEXT_FLAGS_MONO 0x8 enum DMAObjects { - NvContextSurfaces = 0x80000010, - NvRop = 0x80000011, - NvImagePattern = 0x80000012, - NvClipRectangle = 0x80000013, - NvSolidLine = 0x80000014, - NvImageBlit = 0x80000015, - NvRectangle = 0x80000016, - NvScaledImage = 0x80000017, - NvMemFormat = 0x80000018, - NvDmaFB = 0xD8000001, - NvDmaAGP = 0xD8000002, - NvDmaNotifier0 = 0xD8000003 + NvContextSurfaces = 0x80000010, + NvRop = 0x80000011, + NvImagePattern = 0x80000012, + NvClipRectangle = 0x80000013, + NvSolidLine = 0x80000014, + NvImageBlit = 0x80000015, + NvRectangle = 0x80000016, + NvScaledImage = 0x80000017, + NvMemFormat = 0x80000018, + Nv3D = 0x80000019, + NvDmaFB = 0xD8000001, + NvDmaAGP = 0xD8000002, + NvDmaNotifier0 = 0xD8000003 }; enum DMASubchannel { /* EXA + XAA + Xv */ - NvSubContextSurfaces = 0, - NvSubRectangle = 1, - NvSubScaledImage = 2, + NvSubContextSurfaces = 0, + NvSubRectangle = 1, + NvSubScaledImage = 2, /* EXA + XAA */ - NvSubRop = 3, - NvSubImagePattern = 4, - NvSubImageBlit = 5, + NvSubRop = 3, + NvSubImagePattern = 4, + NvSubImageBlit = 5, /* EXA */ - NvSubMemFormat = 6, + NvSubMemFormat = 6, + NvSub3D = 7, /* XAA */ - NvSubClipRectangle = 6, - NvSubSolidLine = 7, + NvSubClipRectangle = 6, + NvSubSolidLine = 7, }; #define NVDmaNext(pNv, data) { \ |