summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKenneth Graunke <[email protected]>2011-10-08 00:40:39 -0700
committerKenneth Graunke <[email protected]>2011-10-18 15:57:55 -0700
commitfeaff3aeebb2eebfa93ad641e0ed286ab0409d21 (patch)
tree495e9be45026d7624d34fdedd97a1b3785f6ec92
parentfa0aa3796d3483cf8924fa127085d075d34019e8 (diff)
i965: Remove duplicate copies of mlen & rlen from instruction decode.
After printing the details of a specific message, we always print out the message length and response length with nice "mlen" and "rlen" labels. For Gen5+ URB writes, we were dumping mlen and rlen a second time: urb 0 urb_write interleave used complete mlen 5, rlen 0 mlen 5 rlen 0 Also, for Gen6 data port messages, we were including mlen and rlen in the tuple of undecipherable integers. Both of these are completely redundant. So, remove them. Signed-off-by: Kenneth Graunke <[email protected]> Reviewed-by: Eric Anholt <[email protected]>
-rw-r--r--src/mesa/drivers/dri/i965/brw_disasm.c17
1 files changed, 4 insertions, 13 deletions
diff --git a/src/mesa/drivers/dri/i965/brw_disasm.c b/src/mesa/drivers/dri/i965/brw_disasm.c
index 515fd7bcd1a..a010cd727b7 100644
--- a/src/mesa/drivers/dri/i965/brw_disasm.c
+++ b/src/mesa/drivers/dri/i965/brw_disasm.c
@@ -1002,13 +1002,11 @@ int brw_disasm (FILE *file, struct brw_instruction *inst, int gen)
break;
case BRW_SFID_DATAPORT_READ:
if (gen >= 6) {
- format (file, " (%d, %d, %d, %d, %d, %d)",
+ format (file, " (%d, %d, %d, %d)",
inst->bits3.gen6_dp.binding_table_index,
inst->bits3.gen6_dp.msg_control,
inst->bits3.gen6_dp.msg_type,
- inst->bits3.gen6_dp.send_commit_msg,
- inst->bits3.gen6_dp.msg_length,
- inst->bits3.gen6_dp.response_length);
+ inst->bits3.gen6_dp.send_commit_msg);
} else if (gen >= 5 /* FINISHME: || is_g4x */) {
format (file, " (%d, %d, %d)",
inst->bits3.dp_read_gen5.binding_table_index,
@@ -1030,13 +1028,11 @@ int brw_disasm (FILE *file, struct brw_instruction *inst, int gen)
dp_rc_msg_type_gen6,
inst->bits3.gen6_dp.msg_type, &space);
- format (file, ", %d, %d, %d, %d, %d, %d)",
+ format (file, ", %d, %d, %d, %d)",
inst->bits3.gen6_dp.binding_table_index,
inst->bits3.gen6_dp.msg_control,
inst->bits3.gen6_dp.msg_type,
- inst->bits3.gen6_dp.send_commit_msg,
- inst->bits3.gen6_dp.msg_length,
- inst->bits3.gen6_dp.response_length);
+ inst->bits3.gen6_dp.send_commit_msg);
} else {
format (file, " (%d, %d, %d, %d)",
inst->bits3.dp_write.binding_table_index,
@@ -1067,11 +1063,6 @@ int brw_disasm (FILE *file, struct brw_instruction *inst, int gen)
inst->bits3.urb.used, &space);
err |= control (file, "urb complete", urb_complete,
inst->bits3.urb.complete, &space);
- if (gen >= 5) {
- format (file, " mlen %d, rlen %d\n",
- inst->bits3.urb_gen5.msg_length,
- inst->bits3.urb_gen5.response_length);
- }
break;
case BRW_SFID_THREAD_SPAWNER:
break;