diff options
| author | Daniel Vetter <daniel.vetter@ffwll.ch> | 2013-04-03 18:25:12 +0200 |
|---|---|---|
| committer | Daniel Vetter <daniel.vetter@ffwll.ch> | 2013-04-04 09:59:20 +0200 |
| commit | b7bb9e929786eb8bae86cf50f54dcb94bfa7ad46 (patch) | |
| tree | 3eabfe71ff2f3af5432a32078883da192fb8a3cb | |
| parent | ca678bc073462623cfc89dea80271bc361f1655f (diff) | |
| download | drm-b7bb9e929786eb8bae86cf50f54dcb94bfa7ad46.tar.gz | |
intel-decode: Fix gen6 HIER_DEPTH_BUFFER decoding
It accidentally used the cmd id for the gen7 command and had an
outdated lenght field. Spotted while trying to make sense of an ivb
error_state from mesa 7.11 ...
Reviewed-by: Eric Anholt <eric@anholt.net>
Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
| -rw-r--r-- | intel/intel_decode.c | 2 | ||||
| -rw-r--r-- | intel/tests/gen6-3d.batch-ref.txt | 6 |
2 files changed, 4 insertions, 4 deletions
diff --git a/intel/intel_decode.c b/intel/intel_decode.c index 842921b3..ff19f92e 100644 --- a/intel/intel_decode.c +++ b/intel/intel_decode.c @@ -3162,7 +3162,7 @@ decode_3d_965(struct drm_intel_decode *ctx) { 0x7805, 0x00ff, 3, 3, "3DSTATE_URB" }, { 0x7804, 0x00ff, 3, 3, "3DSTATE_CLEAR_PARAMS" }, { 0x7806, 0x00ff, 3, 3, "3DSTATE_STENCIL_BUFFER" }, - { 0x7807, 0x00ff, 4, 4, "3DSTATE_HIER_DEPTH_BUFFER", 6 }, + { 0x790f, 0x00ff, 3, 3, "3DSTATE_HIER_DEPTH_BUFFER", 6 }, { 0x7807, 0x00ff, 3, 3, "3DSTATE_HIER_DEPTH_BUFFER", 7, gen7_3DSTATE_HIER_DEPTH_BUFFER }, { 0x7808, 0x00ff, 5, 257, "3DSTATE_VERTEX_BUFFERS" }, { 0x7809, 0x00ff, 3, 256, "3DSTATE_VERTEX_ELEMENTS" }, diff --git a/intel/tests/gen6-3d.batch-ref.txt b/intel/tests/gen6-3d.batch-ref.txt index 9499ed16..9035663d 100644 --- a/intel/tests/gen6-3d.batch-ref.txt +++ b/intel/tests/gen6-3d.batch-ref.txt @@ -146,9 +146,9 @@ 0x12300244: 0x00000000: volume depth 0x12300248: 0x00000000: 0x1230024c: 0x00000000: -0x12300250: 0x790f0001: 3D UNKNOWN: 3d_965 opcode = 0x790f -0x12300254: 0x000005ff: MI_NOOP -0x12300258: 0x00000000: MI_NOOP +0x12300250: 0x790f0001: 3DSTATE_HIER_DEPTH_BUFFER +0x12300254: 0x000005ff: dword 1 +0x12300258: 0x00000000: dword 2 0x1230025c: 0x790e0001: 3D UNKNOWN: 3d_965 opcode = 0x790e 0x12300260: 0x0000027f: MI_NOOP 0x12300264: 0x00000000: MI_NOOP |