git://git.onelab.eu
/
linux-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
linux 2.6.16.38 w/ vs2.0.3-rc1
[linux-2.6.git]
/
drivers
/
char
/
drm
/
radeon_drm.h
diff --git
a/drivers/char/drm/radeon_drm.h
b/drivers/char/drm/radeon_drm.h
index
8d6350d
..
9c177a6
100644
(file)
--- a/
drivers/char/drm/radeon_drm.h
+++ b/
drivers/char/drm/radeon_drm.h
@@
-161,8
+161,7
@@
#define R200_EMIT_PP_TXCTLALL_3 91
#define R200_EMIT_PP_TXCTLALL_4 92
#define R200_EMIT_PP_TXCTLALL_5 93
#define R200_EMIT_PP_TXCTLALL_3 91
#define R200_EMIT_PP_TXCTLALL_4 92
#define R200_EMIT_PP_TXCTLALL_5 93
-#define R200_EMIT_VAP_PVS_CNTL 94
-#define RADEON_MAX_STATE_PACKETS 95
+#define RADEON_MAX_STATE_PACKETS 94
/* Commands understood by cmd_buffer ioctl. More can be added but
* obviously these can't be removed or changed:
/* Commands understood by cmd_buffer ioctl. More can be added but
* obviously these can't be removed or changed:
@@
-177,7
+176,6
@@
#define RADEON_CMD_WAIT 8 /* emit hw wait commands -- note:
* doesn't make the cpu wait, just
* the graphics hardware */
#define RADEON_CMD_WAIT 8 /* emit hw wait commands -- note:
* doesn't make the cpu wait, just
* the graphics hardware */
-#define RADEON_CMD_VECLINEAR 9 /* another r200 stopgap */
typedef union {
int i;
typedef union {
int i;
@@
-193,9
+191,6
@@
typedef union {
struct {
unsigned char cmd_type, offset, stride, count;
} vectors;
struct {
unsigned char cmd_type, offset, stride, count;
} vectors;
- struct {
- unsigned char cmd_type, addr_lo, addr_hi, count;
- } veclinear;
struct {
unsigned char cmd_type, buf_idx, pad0, pad1;
} dma;
struct {
unsigned char cmd_type, buf_idx, pad0, pad1;
} dma;
@@
-227,7
+222,6
@@
typedef union {
# define R300_WAIT_3D 0x2
# define R300_WAIT_2D_CLEAN 0x3
# define R300_WAIT_3D_CLEAN 0x4
# define R300_WAIT_3D 0x2
# define R300_WAIT_2D_CLEAN 0x3
# define R300_WAIT_3D_CLEAN 0x4
-#define R300_CMD_SCRATCH 8
typedef union {
unsigned int u;
typedef union {
unsigned int u;
@@
-253,9
+247,6
@@
typedef union {
struct {
unsigned char cmd_type, flags, pad0, pad1;
} wait;
struct {
unsigned char cmd_type, flags, pad0, pad1;
} wait;
- struct {
- unsigned char cmd_type, reg, n_bufs, flags;
- } scratch;
} drm_r300_cmd_header_t;
#define RADEON_FRONT 0x1
} drm_r300_cmd_header_t;
#define RADEON_FRONT 0x1
@@
-706,7
+697,6
@@
typedef struct drm_radeon_setparam {
#define RADEON_SETPARAM_FB_LOCATION 1 /* determined framebuffer location */
#define RADEON_SETPARAM_SWITCH_TILING 2 /* enable/disable color tiling */
#define RADEON_SETPARAM_PCIGART_LOCATION 3 /* PCI Gart Location */
#define RADEON_SETPARAM_FB_LOCATION 1 /* determined framebuffer location */
#define RADEON_SETPARAM_SWITCH_TILING 2 /* enable/disable color tiling */
#define RADEON_SETPARAM_PCIGART_LOCATION 3 /* PCI Gart Location */
-#define RADEON_SETPARAM_NEW_MEMMAP 4 /* Use new memory map */
/* 1.14: Clients can allocate/free a surface
*/
/* 1.14: Clients can allocate/free a surface
*/