aboutsummaryrefslogtreecommitdiff
path: root/shared-core/r300_reg.h
diff options
context:
space:
mode:
authorEric Anholt <eric@anholt.net>2008-05-30 14:42:08 -0700
committerEric Anholt <eric@anholt.net>2008-05-30 14:42:08 -0700
commit461bfa3da6f85b85c21cd84f81bb4eefa5481418 (patch)
tree33e91c8cd024f67922670f9ed6565ceda1e4f3b5 /shared-core/r300_reg.h
parent50bce2bc625deb439dd61f504496dddd0cd4f572 (diff)
parent6e8a2cff66ac0d6afaf9bb233bc81449c2014078 (diff)
Merge commit 'origin/master' into drm-gem
Conflicts: linux-core/Makefile.kernel shared-core/i915_drv.h shared-core/nouveau_state.c
Diffstat (limited to 'shared-core/r300_reg.h')
-rw-r--r--shared-core/r300_reg.h12
1 files changed, 11 insertions, 1 deletions
diff --git a/shared-core/r300_reg.h b/shared-core/r300_reg.h
index 578e7e93..0be01fc7 100644
--- a/shared-core/r300_reg.h
+++ b/shared-core/r300_reg.h
@@ -1349,7 +1349,7 @@ USE OR OTHER DEALINGS IN THE SOFTWARE.
/* Guess by Vladimir.
* Set to 0A before 3D operations, set to 02 afterwards.
*/
-#define R300_RB3D_DSTCACHE_CTLSTAT 0x4E4C
+/*#define R300_RB3D_DSTCACHE_CTLSTAT 0x4E4C*/
# define R300_RB3D_DSTCACHE_UNKNOWN_02 0x00000002
# define R300_RB3D_DSTCACHE_UNKNOWN_0A 0x0000000A
@@ -1626,12 +1626,22 @@ USE OR OTHER DEALINGS IN THE SOFTWARE.
*/
#define R300_CP_CMD_BITBLT_MULTI 0xC0009B00
+#define R500_VAP_INDEX_OFFSET 0x208c
+
#define R500_GA_US_VECTOR_INDEX 0x4250
#define R500_GA_US_VECTOR_DATA 0x4254
#define R500_RS_IP_0 0x4074
#define R500_RS_INST_0 0x4320
+#define R500_US_CONFIG 0x4600
+
+#define R500_US_FC_CTRL 0x4624
+#define R500_US_CODE_ADDR 0x4630
+
+#define R500_RB3D_COLOR_CLEAR_VALUE_AR 0x46c0
+#define R500_RB3D_CONSTANT_COLOR_AR 0x4ef8
+
#endif /* _R300_REG_H */
/* *INDENT-ON* */