projects
/
platform
/
upstream
/
libdrm.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
3add949
)
move some more r300 regs into not allowed on r500
author
Dave Airlie
<airlied@redhat.com>
Wed, 19 Mar 2008 06:10:37 +0000
(16:10 +1000)
committer
Dave Airlie
<airlied@redhat.com>
Wed, 19 Mar 2008 06:10:37 +0000
(16:10 +1000)
shared-core/r300_cmdbuf.c
patch
|
blob
|
history
diff --git
a/shared-core/r300_cmdbuf.c
b/shared-core/r300_cmdbuf.c
index
89a84b7
..
ccf82d1
100644
(file)
--- 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(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);
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(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);
ADD_RANGE(R300_PFS_INSTR0_0, 64);
ADD_RANGE(R300_PFS_INSTR1_0, 64);
ADD_RANGE(R300_PFS_INSTR2_0, 64);