From: Eric Anholt <eric@anholt.net>
Date: Thu, 8 Jul 2010 20:01:57 +0000 (-0700)
Subject: i965: Add disasm for SEND mlen/rlen on Sandybridge.
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=8a3f2eb9e6c830ff953751221961f2a6c8f76661;p=mesa.git

i965: Add disasm for SEND mlen/rlen on Sandybridge.
---

diff --git a/src/mesa/drivers/dri/i965/brw_disasm.c b/src/mesa/drivers/dri/i965/brw_disasm.c
index 3dbf4ad3a04..23095d912a2 100644
--- a/src/mesa/drivers/dri/i965/brw_disasm.c
+++ b/src/mesa/drivers/dri/i965/brw_disasm.c
@@ -917,7 +917,7 @@ int brw_disasm (FILE *file, struct brw_instruction *inst, int gen)
 	}
 	if (space)
 	    string (file, " ");
-	if (gen == 5) {
+	if (gen >= 5) {
 	   format (file, "mlen %d",
 		   inst->bits3.generic_gen5.msg_length);
 	   format (file, " rlen %d",
diff --git a/src/mesa/drivers/dri/i965/brw_structs.h b/src/mesa/drivers/dri/i965/brw_structs.h
index 205d1b90fd7..2fde42a7060 100644
--- a/src/mesa/drivers/dri/i965/brw_structs.h
+++ b/src/mesa/drivers/dri/i965/brw_structs.h
@@ -1686,7 +1686,7 @@ struct brw_instruction
       } dp_render_cache;
 
       struct {
-	 GLuint pad:16;
+	 GLuint function_control:16;
 	 GLuint response_length:4;
 	 GLuint msg_length:4;
 	 GLuint msg_target:4;
@@ -1694,8 +1694,9 @@ struct brw_instruction
 	 GLuint end_of_thread:1;
       } generic;
 
+      /* Of this struct, only end_of_thread is not present for gen6. */
       struct {
-	 GLuint pad:19;
+	 GLuint function_control:19;
 	 GLuint header_present:1;
 	 GLuint response_length:5;
 	 GLuint msg_length:4;