[Intel-gfx] [PATCH 10/17] intel: Parse the correct length for gen7 3DSTATE_MULTISAMPLE.

Eric Anholt eric at anholt.net
Wed Jan 4 23:54:52 CET 2012


---
 intel/intel_decode.c              |    3 ++-
 intel/tests/gen7-3d.batch-ref.txt |    1 -
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/intel/intel_decode.c b/intel/intel_decode.c
index 3548f57..864d802 100644
--- 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 953b7bd..1f68a4b 100644
--- 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
-- 
1.7.7.3




More information about the Intel-gfx mailing list