diff options
| author | Eric Anholt <eric@anholt.net> | 2012-01-04 12:01:49 -0800 |
|---|---|---|
| committer | Eric Anholt <eric@anholt.net> | 2012-01-27 13:21:19 -0800 |
| commit | 5a1c10fe6a50c6b21e616bb77bfb00a9903cc517 (patch) | |
| tree | 77c68a1e3b329fc49279440f8ce318798cdb658e /intel | |
| parent | 9695eee8a2b6c749d79980e6057ac231aea6cb6d (diff) | |
intel: Parse the correct length for gen7 3DSTATE_MULTISAMPLE.
Diffstat (limited to 'intel')
| -rw-r--r-- | intel/intel_decode.c | 3 | ||||
| -rw-r--r-- | 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 3548f574..864d8027 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 953b7bdf..1f68a4bf 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 |