summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDave Airlie <airlied@redhat.com>2008-03-19 16:10:37 +1000
committerDave Airlie <airlied@redhat.com>2008-03-19 16:10:37 +1000
commita3c808d8feff9dc379f71f971ca20ec3c686b0c0 (patch)
tree5fe9014bc1681440e21bf6ca6ffa9913377dde07
parent3add9494037e7c88b5e5a476001176784d743a26 (diff)
move some more r300 regs into not allowed on r500
-rw-r--r--shared-core/r300_cmdbuf.c7
1 files changed, 4 insertions, 3 deletions
diff --git a/shared-core/r300_cmdbuf.c b/shared-core/r300_cmdbuf.c
index 89a84b7a..ccf82d1f 100644
--- a/shared-core/r300_cmdbuf.c
+++ b/shared-core/r300_cmdbuf.c
@@ -192,9 +192,7 @@ void r300_init_reg_flags(struct drm_device *dev)
ADD_RANGE(0x43A4, 2);
ADD_RANGE(0x43E8, 1);
- ADD_RANGE(R300_PFS_CNTL_0, 3);
- ADD_RANGE(R300_PFS_NODE_0, 4);
- ADD_RANGE(R300_PFS_TEXI_0, 64);
+
ADD_RANGE(0x46A4, 5);
ADD_RANGE(R300_RE_FOG_STATE, 1);
@@ -240,6 +238,9 @@ void r300_init_reg_flags(struct drm_device *dev)
ADD_RANGE(R500_RS_IP_0, 16);
ADD_RANGE(R500_RS_INST_0, 16);
} else {
+ ADD_RANGE(R300_PFS_CNTL_0, 3);
+ ADD_RANGE(R300_PFS_NODE_0, 4);
+ ADD_RANGE(R300_PFS_TEXI_0, 64);
ADD_RANGE(R300_PFS_INSTR0_0, 64);
ADD_RANGE(R300_PFS_INSTR1_0, 64);
ADD_RANGE(R300_PFS_INSTR2_0, 64);