diff options
| author | Ben Skeggs <darktama@iinet.net.au> | 2006-09-02 22:17:55 +1000 |
|---|---|---|
| committer | Ben Skeggs <darktama@iinet.net.au> | 2006-09-02 22:17:55 +1000 |
| commit | 69ace0c4388cb1a66ea74f627fe02fe89e7d35c0 (patch) | |
| tree | 3a29096a335d296085b4c1982dc1a85b6b808514 /src/nv_dma.h | |
| parent | 72cf79b9e5dc0d97e933f540d063161129bbebf7 (diff) | |
| download | xorg-driver-xf86-video-nouveau-69ace0c4388cb1a66ea74f627fe02fe89e7d35c0.tar.gz | |
Kill off one of the M2MF objects, and use the engine's SET_OBJECT_{IN_OUT} to
swap between AGP->VRAM and VRAM->AGP.
Diffstat (limited to 'src/nv_dma.h')
| -rw-r--r-- | src/nv_dma.h | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/src/nv_dma.h b/src/nv_dma.h index 55685d1..115b57a 100644 --- a/src/nv_dma.h +++ b/src/nv_dma.h @@ -68,8 +68,7 @@ enum DMAObjects { NvImageBlit = 0x80000015, NvRectangle = 0x80000016, NvScaledImage = 0x80000017, - NvGraphicsToAGP = 0x80000018, - NvAGPToGraphics = 0x80000019, + NvMemFormat = 0x80000018, NvDmaFB = 0xD8000001, NvDmaAGP = 0xD8000002, NvDmaNotifier0 = 0xD8000003 @@ -85,7 +84,7 @@ enum DMASubchannel { NvSubImagePattern = 4, NvSubImageBlit = 5, /* EXA */ - NvSubGraphicsToAGP = 6, + NvSubMemFormat = 6, /* XAA */ NvSubClipRectangle = 6, NvSubSolidLine = 7, @@ -256,6 +255,8 @@ enum DMASubchannel { #define MEMFORMAT_NOTIFY 0x00000104 #define MEMFORMAT_DMA_NOTIFY 0x00000180 +#define MEMFORMAT_DMA_OBJECT_IN 0x00000184 +#define MEMFORMAT_DMA_OBJECT_OUT 0x00000188 #define MEMFORMAT_OFFSET_IN 0x0000030C #define MEMFORMAT_OFFSET_OUT 0x00000310 #define MEMFORMAT_PITCH_IN 0x00000314 |