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 3dbf4ad3a04a76af2a6dfb74b8acfbf6b777ca85..23095d912a227c80e4fa2de6bd658d2144616cfa 100644 (file)
--- 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 205d1b90fd7674336491d39e1f46e394ee30a269..2fde42a70607750c2b1302d6e7dfcf70088482df 100644 (file)
--- 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;