summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKeith Whitwell <keith@tungstengraphics.com>2002-07-04 15:34:45 +0000
committerKeith Whitwell <keith@tungstengraphics.com>2002-07-04 15:34:45 +0000
commitd50f3b1d36cb281b4b51148c32f866cebec5236b (patch)
tree4263e665a8b674802824631334097a25db8477f5
parentf53833d1ac4885e211db04cef86857cb4fbf463e (diff)
Turn off set_scissors packet, emit a lot of constant state.
-rw-r--r--linux/radeon_drm.h11
-rw-r--r--linux/radeon_drv.h9
-rw-r--r--linux/radeon_state.c9
3 files changed, 28 insertions, 1 deletions
diff --git a/linux/radeon_drm.h b/linux/radeon_drm.h
index bb6e5a6a..1a6657cf 100644
--- a/linux/radeon_drm.h
+++ b/linux/radeon_drm.h
@@ -119,7 +119,16 @@
#define R200_EMIT_VTE_CNTL 48 /* vte/1 */
#define R200_EMIT_OUTPUT_VTX_COMP_SEL 49 /* vtx/1 */
#define R200_EMIT_PP_TAM_DEBUG3 50 /* tam/1 */
-#define RADEON_MAX_STATE_PACKETS 51
+#define R200_EMIT_PP_CNTL_X 51 /* cst/1 */
+#define R200_EMIT_RB3D_DEPTHXY_OFFSET 52 /* cst/1 */
+#define R200_EMIT_RE_AUX_SCISSOR_CNTL 53 /* cst/1 */
+#define R200_EMIT_RE_SCISSOR_TL_0 54 /* cst/2 */
+#define R200_EMIT_RE_SCISSOR_TL_1 55 /* cst/2 */
+#define R200_EMIT_RE_SCISSOR_TL_2 56 /* cst/2 */
+#define R200_EMIT_SE_VAP_CNTL_STATUS 57 /* cst/1 */
+#define R200_EMIT_SE_VTX_STATE_CNTL 58 /* cst/1 */
+#define R200_EMIT_RE_POINTSIZE 59 /* cst/1 */
+#define RADEON_MAX_STATE_PACKETS 60
/* Commands understood by cmd_buffer ioctl. More can be added but
diff --git a/linux/radeon_drv.h b/linux/radeon_drv.h
index 6e605e6f..80fa7596 100644
--- a/linux/radeon_drv.h
+++ b/linux/radeon_drv.h
@@ -562,6 +562,15 @@ extern int radeon_cp_flip( struct inode *inode, struct file *filp,
#define R200_SE_VTE_CNTL 0x20b0
#define R200_SE_TCL_OUTPUT_VTX_COMP_SEL 0x2250
#define R200_PP_TAM_DEBUG3 0x2d9c
+#define R200_PP_CNTL_X 0x2cc4
+#define R200_SE_VAP_CNTL_STATUS 0x2140
+#define R200_RE_SCISSOR_TL_0 0x1cd8
+#define R200_RE_SCISSOR_TL_1 0x1ce0
+#define R200_RE_SCISSOR_TL_2 0x1ce8
+#define R200_RB3D_DEPTHXY_OFFSET 0x1d60
+#define R200_RE_AUX_SCISSOR_CNTL 0x26f0
+#define R200_SE_VTX_STATE_CNTL 0x2180
+#define R200_RE_POINTSIZE 0x2648
#define SE_VAP_CNTL__TCL_ENA_MASK 0x00000001
diff --git a/linux/radeon_state.c b/linux/radeon_state.c
index 7c4757af..3d23bad7 100644
--- a/linux/radeon_state.c
+++ b/linux/radeon_state.c
@@ -280,6 +280,15 @@ static struct {
{ R200_SE_VTE_CNTL, 1, "R200_SE_VTE_CNTL" },
{ R200_SE_TCL_OUTPUT_VTX_COMP_SEL, 1, "R200_SE_TCL_OUTPUT_VTX_COMP_SEL" },
{ R200_PP_TAM_DEBUG3, 1, "R200_PP_TAM_DEBUG3" },
+ { R200_PP_CNTL_X, 1, "R200_PP_CNTL_X" },
+ { R200_RB3D_DEPTHXY_OFFSET, 1, "R200_RB3D_DEPTHXY_OFFSET" },
+ { R200_RE_AUX_SCISSOR_CNTL, 1, "R200_RE_AUX_SCISSOR_CNTL" },
+ { R200_RE_SCISSOR_TL_0, 2, "R200_RE_SCISSOR_TL_0" },
+ { R200_RE_SCISSOR_TL_1, 2, "R200_RE_SCISSOR_TL_1" },
+ { R200_RE_SCISSOR_TL_2, 2, "R200_RE_SCISSOR_TL_2" },
+ { R200_SE_VAP_CNTL_STATUS, 1, "R200_SE_VAP_CNTL_STATUS" },
+ { R200_SE_VTX_STATE_CNTL, 1, "R200_SE_VTX_STATE_CNTL" },
+ { R200_RE_POINTSIZE, 1, "R200_RE_POINTSIZE" },
};