intel: Parse the correct length for gen7 3DSTATE_MULTISAMPLE.

diff --git a/intel/intel_decode.c b/intel/intel_decode.c
index 3548f574c5a6c4cc4a6504025d609a83fe2b60a9..864d8027306a4d5da90e85cdd7b79bca987d5f0c 100644 (file)
--- a/intel/intel_decode.c
+++ b/intel/intel_decode.c
@@ -2744,7 +2744,8 @@ decode_3d_965(struct drm_intel_decode *ctx)
                { 0x7909, 2, 2, "3DSTATE_CLEAR_PARAMS" },
                { 0x790a, 3, 3, "3DSTATE_AA_LINE_PARAMETERS" },
                { 0x790b, 4, 4, "3DSTATE_GS_SVB_INDEX" },
-               { 0x790d, 3, 3, "3DSTATE_MULTISAMPLE" },
+               { 0x790d, 3, 3, "3DSTATE_MULTISAMPLE", 6 },
+               { 0x790d, 4, 4, "3DSTATE_MULTISAMPLE", 7 },
                { 0x7910, 2, 2, "3DSTATE_CLEAR_PARAMS" },
                { 0x7b00, 6, 6, "3DPRIMITIVE" },
                { 0x7802, 4, 4, "3DSTATE_SAMPLER_STATE_POINTERS" },

diff --git a/intel/tests/gen7-3d.batch-ref.txt b/intel/tests/gen7-3d.batch-ref.txt
index 953b7bdfcb2442d8aaf50ffbc648cb17dad2d20a..1f68a4bfe05d0b89510c43716eff33c94a20780f 100644 (file)
--- a/intel/tests/gen7-3d.batch-ref.txt
+++ b/intel/tests/gen7-3d.batch-ref.txt
@@ -1,6 +1,5 @@
 0x12300000:      0x69040000: 3DSTATE_PIPELINE_SELECT
 0x12300004:      0x790d0002: 3DSTATE_MULTISAMPLE
-Bad count in 3DSTATE_MULTISAMPLE
 0x12300008:      0x00000000:    dword 1
 0x1230000c:      0x00000000:    dword 2
 0x12300010:      0x00000000:    dword 3