summaryrefslogtreecommitdiff
path: root/src/nv_dma.h
diff options
context:
space:
mode:
authorBen Skeggs <skeggsb@gmail.com>2007-10-17 16:29:01 +1100
committerBen Skeggs <skeggsb@gmail.com>2007-10-17 22:55:12 +1100
commit0d1835d67e38ca12347a7965ac43fbfc29063b87 (patch)
treec237b87891d74d9c53dbd829a0c19eefdc8b4d6f /src/nv_dma.h
parentb36fbf174849b04928efda2909c461b6c1688cdc (diff)
downloadxorg-driver-xf86-video-nouveau-0d1835d67e38ca12347a7965ac43fbfc29063b87.tar.gz
Switch to header generated from XML + other cleanups.
- Renamed object header to nouveau_class.h, so it's not confused with mmio - Removed usage of method defines in nv_dma.h - Removed 2D engine EXA composite hook, it was broken, useless and soon to be obsoleted by card-specific versions. - Use names in a few places that magic values were previously used.
Diffstat (limited to 'src/nv_dma.h')
-rw-r--r--src/nv_dma.h168
1 files changed, 0 insertions, 168 deletions
diff --git a/src/nv_dma.h b/src/nv_dma.h
index ed3684a..f28dab1 100644
--- a/src/nv_dma.h
+++ b/src/nv_dma.h
@@ -44,16 +44,6 @@
#define NVDEBUG if (NV_DMA_DEBUG) ErrorF
-#define NV_DMA_ACCES_RW 0
-#define NV_DMA_ACCES_RO 1
-#define NV_DMA_ACCES_WO 2
-#define NV_DMA_TARGET_VIDMEM 0
-/*
-#define NV_DMA_TARGET_VIDMEM_TILED 1
-#define NV_DMA_TARGET_PCI 2
-*/
-#define NV_DMA_TARGET_AGP 3
-
enum DMAObjects {
NvNullObject = 0x00000000,
NvContextSurfaces = 0x80000010,
@@ -99,162 +89,4 @@ extern void NVDmaStart(NVPtr pNv, uint32_t object, uint32_t tag, int size);
NVDmaNext((pNv), c.u); \
} while(0)
-#define SURFACE_FORMAT 0x00000300
-#define SURFACE_FORMAT_Y8 0x00000001
-#define SURFACE_FORMAT_X1R5G5B5 0x00000002
-#define SURFACE_FORMAT_R5G6B5 0x00000004
-#define SURFACE_FORMAT_X8R8G8B8 0x00000006
-#define SURFACE_FORMAT_A8R8G8B8 0x0000000a
-#define SURFACE_PITCH 0x00000304
-#define SURFACE_PITCH_SRC 15:0
-#define SURFACE_PITCH_DST 31:16
-#define SURFACE_OFFSET_SRC 0x00000308
-#define SURFACE_OFFSET_DST 0x0000030C
-
-#define ROP_SET 0x00000300
-
-#define PATTERN_FORMAT 0x00000300
-#define PATTERN_FORMAT_DEPTH8 0x00000003
-#define PATTERN_FORMAT_DEPTH16 0x00000001
-#define PATTERN_FORMAT_DEPTH24 0x00000003
-#define PATTERN_COLOR_0 0x00000310
-#define PATTERN_COLOR_1 0x00000314
-#define PATTERN_PATTERN_0 0x00000318
-#define PATTERN_PATTERN_1 0x0000031C
-
-#define CLIP_POINT 0x00000300
-#define CLIP_POINT_X 15:0
-#define CLIP_POINT_Y 31:16
-#define CLIP_SIZE 0x00000304
-#define CLIP_SIZE_WIDTH 15:0
-#define CLIP_SIZE_HEIGHT 31:16
-
-#define LINE_FORMAT 0x00000300
-#define LINE_FORMAT_DEPTH8 0x00000003
-#define LINE_FORMAT_DEPTH16 0x00000001
-#define LINE_FORMAT_DEPTH24 0x00000003
-#define LINE_COLOR 0x00000304
-#define LINE_MAX_LINES 16
-#define LINE_LINES(i) 0x00000400\
- +(i)*8
-#define LINE_LINES_POINT0_X 15:0
-#define LINE_LINES_POINT0_Y 31:16
-#define LINE_LINES_POINT1_X 47:32
-#define LINE_LINES_POINT1_Y 63:48
-
-#define BLIT_POINT_SRC 0x00000300
-#define BLIT_POINT_SRC_X 15:0
-#define BLIT_POINT_SRC_Y 31:16
-#define BLIT_POINT_DST 0x00000304
-#define BLIT_POINT_DST_X 15:0
-#define BLIT_POINT_DST_Y 31:16
-#define BLIT_SIZE 0x00000308
-#define BLIT_SIZE_WIDTH 15:0
-#define BLIT_SIZE_HEIGHT 31:16
-
-#define RECT_FORMAT 0x00000300
-#define RECT_FORMAT_DEPTH8 0x00000003
-#define RECT_FORMAT_DEPTH16 0x00000001
-#define RECT_FORMAT_DEPTH24 0x00000003
-#define RECT_SOLID_COLOR 0x000003FC
-#define RECT_SOLID_RECTS_MAX_RECTS 32
-#define RECT_SOLID_RECTS(i) 0x00000400\
- +(i)*8
-#define RECT_SOLID_RECTS_Y 15:0
-#define RECT_SOLID_RECTS_X 31:16
-#define RECT_SOLID_RECTS_HEIGHT 47:32
-#define RECT_SOLID_RECTS_WIDTH 63:48
-
-#define RECT_EXPAND_ONE_COLOR_CLIP 0x000007EC
-#define RECT_EXPAND_ONE_COLOR_CLIP_POINT0_X 15:0
-#define RECT_EXPAND_ONE_COLOR_CLIP_POINT0_Y 31:16
-#define RECT_EXPAND_ONE_COLOR_CLIP_POINT1_X 47:32
-#define RECT_EXPAND_ONE_COLOR_CLIP_POINT1_Y 63:48
-#define RECT_EXPAND_ONE_COLOR_COLOR 0x000007F4
-#define RECT_EXPAND_ONE_COLOR_SIZE 0x000007F8
-#define RECT_EXPAND_ONE_COLOR_SIZE_WIDTH 15:0
-#define RECT_EXPAND_ONE_COLOR_SIZE_HEIGHT 31:16
-#define RECT_EXPAND_ONE_COLOR_POINT 0x000007FC
-#define RECT_EXPAND_ONE_COLOR_POINT_X 15:0
-#define RECT_EXPAND_ONE_COLOR_POINT_Y 31:16
-#define RECT_EXPAND_ONE_COLOR_DATA_MAX_DWORDS 128
-#define RECT_EXPAND_ONE_COLOR_DATA(i) 0x00000800\
- +(i)*4
-
-#define RECT_EXPAND_TWO_COLOR_CLIP 0x00000BE4
-#define RECT_EXPAND_TWO_COLOR_CLIP_POINT0_X 15:0
-#define RECT_EXPAND_TWO_COLOR_CLIP_POINT0_Y 31:16
-#define RECT_EXPAND_TWO_COLOR_CLIP_POINT1_X 47:32
-#define RECT_EXPAND_TWO_COLOR_CLIP_POINT1_Y 63:48
-#define RECT_EXPAND_TWO_COLOR_COLOR_0 0x00000BEC
-#define RECT_EXPAND_TWO_COLOR_COLOR_1 0x00000BF0
-#define RECT_EXPAND_TWO_COLOR_SIZE_IN 0x00000BF4
-#define RECT_EXPAND_TWO_COLOR_SIZE_IN_WIDTH 15:0
-#define RECT_EXPAND_TWO_COLOR_SIZE_IN_HEIGHT 31:16
-#define RECT_EXPAND_TWO_COLOR_SIZE_OUT 0x00000BF8
-#define RECT_EXPAND_TWO_COLOR_SIZE_OUT_WIDTH 15:0
-#define RECT_EXPAND_TWO_COLOR_SIZE_OUT_HEIGHT 31:16
-#define RECT_EXPAND_TWO_COLOR_POINT 0x00000BFC
-#define RECT_EXPAND_TWO_COLOR_POINT_X 15:0
-#define RECT_EXPAND_TWO_COLOR_POINT_Y 31:16
-#define RECT_EXPAND_TWO_COLOR_DATA_MAX_DWORDS 128
-#define RECT_EXPAND_TWO_COLOR_DATA(i) 0x00000C00\
- +(i)*4
-
-#define STRETCH_BLIT_FORMAT 0x00000300
-#define STRETCH_BLIT_FORMAT_DEPTH8 0x00000004
-#define STRETCH_BLIT_FORMAT_DEPTH16 0x00000007
-#define STRETCH_BLIT_FORMAT_DEPTH24 0x00000004
-#define STRETCH_BLIT_FORMAT_A8R8G8B8 0x00000003
-#define STRETCH_BLIT_FORMAT_X8R8G8B8 0x00000004
-#define STRETCH_BLIT_FORMAT_YUYV 0x00000005
-#define STRETCH_BLIT_FORMAT_UYVY 0x00000006
-#define STRETCH_BLIT_OPERATION 0x00000304
-#define STRETCH_BLIT_OPERATION_ROP 0x00000001
-#define STRETCH_BLIT_OPERATION_COPY 0x00000003
-#define STRETCH_BLIT_OPERATION_BLEND 0x00000002
-#define STRETCH_BLIT_CLIP_POINT 0x00000308
-#define STRETCH_BLIT_CLIP_POINT_X 15:0
-#define STRETCH_BLIT_CLIP_POINT_Y 31:16
-#define STRETCH_BLIT_CLIP_POINT 0x00000308
-#define STRETCH_BLIT_CLIP_SIZE 0x0000030C
-#define STRETCH_BLIT_CLIP_SIZE_WIDTH 15:0
-#define STRETCH_BLIT_CLIP_SIZE_HEIGHT 31:16
-#define STRETCH_BLIT_DST_POINT 0x00000310
-#define STRETCH_BLIT_DST_POINT_X 15:0
-#define STRETCH_BLIT_DST_POINT_Y 31:16
-#define STRETCH_BLIT_DST_SIZE 0x00000314
-#define STRETCH_BLIT_DST_SIZE_WIDTH 15:0
-#define STRETCH_BLIT_DST_SIZE_HEIGHT 31:16
-#define STRETCH_BLIT_DU_DX 0x00000318
-#define STRETCH_BLIT_DV_DY 0x0000031C
-#define STRETCH_BLIT_SRC_SIZE 0x00000400
-#define STRETCH_BLIT_SRC_SIZE_WIDTH 15:0
-#define STRETCH_BLIT_SRC_SIZE_HEIGHT 31:16
-#define STRETCH_BLIT_SRC_FORMAT 0x00000404
-#define STRETCH_BLIT_SRC_FORMAT_PITCH 15:0
-#define STRETCH_BLIT_SRC_FORMAT_ORIGIN 23:16
-#define STRETCH_BLIT_SRC_FORMAT_ORIGIN_CENTER 0x00000001
-#define STRETCH_BLIT_SRC_FORMAT_ORIGIN_CORNER 0x00000002
-#define STRETCH_BLIT_SRC_FORMAT_FILTER 31:24
-#define STRETCH_BLIT_SRC_FORMAT_FILTER_POINT_SAMPLE 0x00000000
-#define STRETCH_BLIT_SRC_FORMAT_FILTER_BILINEAR 0x00000001
-#define STRETCH_BLIT_SRC_OFFSET 0x00000408
-#define STRETCH_BLIT_SRC_POINT 0x0000040C
-#define STRETCH_BLIT_SRC_POINT_U 15:0
-#define STRETCH_BLIT_SRC_POINT_V 31:16
-
-
-#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
-#define MEMFORMAT_PITCH_OUT 0x00000318
-#define MEMFORMAT_LINE_LENGTH_IN 0x0000031C
-#define MEMFORMAT_LINE_COUNT 0x00000320
-
-
#endif /* NV_DMA_H */
View Lorry Controller Status