diff options
author | Dave Airlie <airlied@linux.ie> | 2006-06-24 03:04:07 -0400 |
---|---|---|
committer | Dave Airlie <airlied@linux.ie> | 2006-06-24 03:32:10 -0400 |
commit | d6fece051a4ef330922bfafb9d64e3e133e3a8a6 (patch) | |
tree | f75c1a4d4f5324ab21f08cf753c849e33f3365e4 /drivers/char/drm/radeon_drm.h | |
parent | f2a2279ffc0dfd27f6909184a29910e40ae7eebd (diff) |
drm: update radeon to 1.25 add r200 vertex program support
Add support for r200 vertex programs (R200_EMIT_VAP_PVS_CNTL, and new
packet type for making it possible to address whole tcl vector space
and have a larger count)
From: Roland Scheidegger (DRM CVS)
Signed-off-by: Dave Airlie <airlied@linux.ie>
Diffstat (limited to 'drivers/char/drm/radeon_drm.h')
-rw-r--r-- | drivers/char/drm/radeon_drm.h | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/drivers/char/drm/radeon_drm.h b/drivers/char/drm/radeon_drm.h index c8e279e89c2e..8d6350dd5360 100644 --- a/drivers/char/drm/radeon_drm.h +++ b/drivers/char/drm/radeon_drm.h | |||
@@ -161,7 +161,8 @@ | |||
161 | #define R200_EMIT_PP_TXCTLALL_3 91 | 161 | #define R200_EMIT_PP_TXCTLALL_3 91 |
162 | #define R200_EMIT_PP_TXCTLALL_4 92 | 162 | #define R200_EMIT_PP_TXCTLALL_4 92 |
163 | #define R200_EMIT_PP_TXCTLALL_5 93 | 163 | #define R200_EMIT_PP_TXCTLALL_5 93 |
164 | #define RADEON_MAX_STATE_PACKETS 94 | 164 | #define R200_EMIT_VAP_PVS_CNTL 94 |
165 | #define RADEON_MAX_STATE_PACKETS 95 | ||
165 | 166 | ||
166 | /* Commands understood by cmd_buffer ioctl. More can be added but | 167 | /* Commands understood by cmd_buffer ioctl. More can be added but |
167 | * obviously these can't be removed or changed: | 168 | * obviously these can't be removed or changed: |
@@ -176,6 +177,7 @@ | |||
176 | #define RADEON_CMD_WAIT 8 /* emit hw wait commands -- note: | 177 | #define RADEON_CMD_WAIT 8 /* emit hw wait commands -- note: |
177 | * doesn't make the cpu wait, just | 178 | * doesn't make the cpu wait, just |
178 | * the graphics hardware */ | 179 | * the graphics hardware */ |
180 | #define RADEON_CMD_VECLINEAR 9 /* another r200 stopgap */ | ||
179 | 181 | ||
180 | typedef union { | 182 | typedef union { |
181 | int i; | 183 | int i; |
@@ -192,6 +194,9 @@ typedef union { | |||
192 | unsigned char cmd_type, offset, stride, count; | 194 | unsigned char cmd_type, offset, stride, count; |
193 | } vectors; | 195 | } vectors; |
194 | struct { | 196 | struct { |
197 | unsigned char cmd_type, addr_lo, addr_hi, count; | ||
198 | } veclinear; | ||
199 | struct { | ||
195 | unsigned char cmd_type, buf_idx, pad0, pad1; | 200 | unsigned char cmd_type, buf_idx, pad0, pad1; |
196 | } dma; | 201 | } dma; |
197 | struct { | 202 | struct { |