summaryrefslogtreecommitdiff
path: root/src/nv_dma.h
diff options
context:
space:
mode:
authorBen Skeggs <darktama@iinet.net.au>2006-09-02 21:59:26 +1000
committerBen Skeggs <darktama@iinet.net.au>2006-09-02 21:59:26 +1000
commit72cf79b9e5dc0d97e933f540d063161129bbebf7 (patch)
treee3ee2ea899fb750a2e3f3e89be11106091dc8140 /src/nv_dma.h
parent6a06d9022f3c0bc845f02091d83faf95f69f81bd (diff)
downloadxorg-driver-xf86-video-nouveau-72cf79b9e5dc0d97e933f540d063161129bbebf7.tar.gz
Don't create objects that aren't needed. This frees up a couple of subchannels
for EXA, use one of them for MEMORY_TO_MEMORY_FORMAT.
Diffstat (limited to 'src/nv_dma.h')
-rw-r--r--src/nv_dma.h19
1 files changed, 12 insertions, 7 deletions
diff --git a/src/nv_dma.h b/src/nv_dma.h
index aba8e31..55685d1 100644
--- a/src/nv_dma.h
+++ b/src/nv_dma.h
@@ -74,16 +74,21 @@ enum DMAObjects {
NvDmaAGP = 0xD8000002,
NvDmaNotifier0 = 0xD8000003
};
+
enum DMASubchannel {
+/* EXA + XAA + Xv */
NvSubContextSurfaces = 0,
- NvSubRop = 1,
- NvSubImagePattern = 2,
- NvSubClipRectangle = 3,
- NvSubSolidLine = 4,
+ NvSubRectangle = 1,
+ NvSubScaledImage = 2,
+/* EXA + XAA */
+ NvSubRop = 3,
+ NvSubImagePattern = 4,
NvSubImageBlit = 5,
- NvSubRectangle = 6,
- NvSubScaledImage = 7,
- NvSubGraphicsToAGP = 7
+/* EXA */
+ NvSubGraphicsToAGP = 6,
+/* XAA */
+ NvSubClipRectangle = 6,
+ NvSubSolidLine = 7,
};
#define NVDmaNext(pNv, data) { \