diff options
| author | Keith Whitwell <keith@tungstengraphics.com> | 2002-05-30 09:02:31 +0000 |
|---|---|---|
| committer | Keith Whitwell <keith@tungstengraphics.com> | 2002-05-30 09:02:31 +0000 |
| commit | b0894da3a44db736ed2329e641187168e8dd8d38 (patch) | |
| tree | e1b711e88f0a8e4a016c05117d8d1dc48d1c5e70 | |
| parent | a4967c0cad0e16d4b018d12615f629cebb7d74ac (diff) | |
Fix embarrasing dyslexia problem in layout of allowed register packets.
Thought two registers were contiguous, but they weren't. I wonder if
this will fix any random bugs out there.
| -rw-r--r-- | linux/radeon_state.c | 32 |
1 files changed, 25 insertions, 7 deletions
diff --git a/linux/radeon_state.c b/linux/radeon_state.c index 135a0972..99cedfe8 100644 --- a/linux/radeon_state.c +++ b/linux/radeon_state.c @@ -1585,19 +1585,37 @@ static int radeon_emit_packets( drm_radeon_cmd_header_t header, drm_radeon_cmd_buffer_t *cmdbuf ) { - int sz = packet[(int)header.packet.packet_id].len; - int reg = packet[(int)header.packet.packet_id].start; + int id = (int)header.packet.packet_id; + int sz = packet[id].len; + int reg = packet[id].start; int *data = (int *)cmdbuf->buf; RING_LOCALS; if (sz * sizeof(int) > cmdbuf->bufsz) return -EINVAL; - - BEGIN_RING(sz+1); - OUT_RING( CP_PACKET0( reg, (sz-1) ) ); - OUT_RING_USER_TABLE( data, sz ); - ADVANCE_RING(); + /* 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(); + } cmdbuf->buf += sz * sizeof(int); cmdbuf->bufsz -= sz * sizeof(int); |