summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKeith Whitwell <keith@tungstengraphics.com>2002-06-10 11:01:57 +0000
committerKeith Whitwell <keith@tungstengraphics.com>2002-06-10 11:01:57 +0000
commita01b578b3bee421740ab4654a1f464a188284306 (patch)
tree81b1b8831796c2ece20f37104b3bd3dcf1ce8d2b
parentb0894da3a44db736ed2329e641187168e8dd8d38 (diff)
Belatedly remove bogus fix. The real problem was an incorrect register idtcl-0-0-20020612-freeze
in radeon_reg.h, which didn't actually effect anything.
-rw-r--r--linux/radeon_state.c26
1 files changed, 4 insertions, 22 deletions
diff --git a/linux/radeon_state.c b/linux/radeon_state.c
index 99cedfe8..0e7df7cf 100644
--- a/linux/radeon_state.c
+++ b/linux/radeon_state.c
@@ -1594,28 +1594,10 @@ static int radeon_emit_packets(
if (sz * sizeof(int) > cmdbuf->bufsz)
return -EINVAL;
- /* Embarrassing dyslexia problem, fixed up here rather than
- * changing the interface.
- */
- if (id == RADEON_EMIT_SE_CNTL) {
- int tmp;
- BEGIN_RING(4);
- OUT_RING( CP_PACKET0( RADEON_SE_CNTL, 0 ) );
- if (__get_user( tmp, &data[0]))
- return -EFAULT;
- OUT_RING( tmp );
- OUT_RING( CP_PACKET0( RADEON_SE_COORD_FMT, 0 ) );
- if (__get_user( tmp, &data[1]))
- return -EFAULT;
- OUT_RING( tmp );
- ADVANCE_RING();
- }
- else {
- BEGIN_RING(sz+1);
- OUT_RING( CP_PACKET0( reg, (sz-1) ) );
- OUT_RING_USER_TABLE( data, sz );
- ADVANCE_RING();
- }
+ BEGIN_RING(sz+1);
+ OUT_RING( CP_PACKET0( reg, (sz-1) ) );
+ OUT_RING_USER_TABLE( data, sz );
+ ADVANCE_RING();
cmdbuf->buf += sz * sizeof(int);
cmdbuf->bufsz -= sz * sizeof(int);