diff options
| author | Ben Widawsky <ben@bwidawsk.net> | 2012-06-27 10:10:53 -0700 |
|---|---|---|
| committer | Ben Widawsky <ben@bwidawsk.net> | 2012-06-27 10:22:37 -0700 |
| commit | a7805194b7b91de01b671beeb724584dca69ad68 (patch) | |
| tree | 8421037419ede724b9460eeccf8e8a771af81deb | |
| parent | df5cc69daba12379b5c0bfd49cffd67e7ebedea1 (diff) | |
intel/decode: fix the reference file forlibdrm-2.4.362.4.36
I mistakenly "fixed" a bad decode with
commit 7d0a1d5ebbe2c6aecd96eef94b0af038858a0178
Author: Ben Widawsky <ben@bwidawsk.net>
Date: Sun Jun 24 20:35:57 2012 -0700
intel/decode: VERTEX_ELEMENT_STATE, 1 means valid
However the actual fix is just to update the reference file, and
include GEN7 in the decode.
Props to Eric Anholt for putting the test in distcheck, or else I
wouldn't have caught this.
Signed-off-by: Ben Widawsky <ben@bwidawsk.net>
| -rw-r--r-- | configure.ac | 2 | ||||
| -rw-r--r-- | intel/intel_decode.c | 4 | ||||
| -rw-r--r-- | intel/tests/gen7-3d.batch-ref.txt | 4 |
3 files changed, 5 insertions, 5 deletions
diff --git a/configure.ac b/configure.ac index f7bea351..1e23b365 100644 --- a/configure.ac +++ b/configure.ac @@ -20,7 +20,7 @@ AC_PREREQ([2.63]) AC_INIT([libdrm], - [2.4.35], + [2.4.36], [https://bugs.freedesktop.org/enter_bug.cgi?product=DRI], [libdrm]) diff --git a/intel/intel_decode.c b/intel/intel_decode.c index 909ae776..19a8d368 100644 --- a/intel/intel_decode.c +++ b/intel/intel_decode.c @@ -3406,8 +3406,8 @@ decode_3d_965(struct drm_intel_decode *ctx) instr_out(ctx, i, "buffer %d: %svalid, type 0x%04x, " "src offset 0x%04x bytes\n", - data[i] >> (IS_GEN6(devid) ? 26 : 27), - data[i] & (1 << (IS_GEN6(devid) ? 25 : 26)) ? + data[i] >> ((IS_GEN6(devid) || IS_GEN7(devid)) ? 26 : 27), + data[i] & (1 << ((IS_GEN6(devid) || IS_GEN7(devid)) ? 25 : 26)) ? "" : "in", (data[i] >> 16) & 0x1ff, data[i] & 0x07ff); i++; diff --git a/intel/tests/gen7-3d.batch-ref.txt b/intel/tests/gen7-3d.batch-ref.txt index be3c85e6..cd2dfc4c 100644 --- a/intel/tests/gen7-3d.batch-ref.txt +++ b/intel/tests/gen7-3d.batch-ref.txt @@ -198,9 +198,9 @@ 0x12300314: 0x158c2fff: max index 0x12300318: 0x00000000: mbz 0x1230031c: 0x78090003: 3DSTATE_VERTEX_ELEMENTS -0x12300320: 0x02850000: buffer 0: invalid, type 0x0085, src offset 0x0000 bytes +0x12300320: 0x02850000: buffer 0: valid, type 0x0085, src offset 0x0000 bytes 0x12300324: 0x11230000: (X, Y, 0.0, 1.0), dst offset 0x00 bytes -0x12300328: 0x02400008: buffer 0: invalid, type 0x0040, src offset 0x0008 bytes +0x12300328: 0x02400008: buffer 0: valid, type 0x0040, src offset 0x0008 bytes 0x1230032c: 0x11130000: (X, Y, Z, 1.0), dst offset 0x00 bytes 0x12300330: 0x7b000005: 3DPRIMITIVE: 0x12300334: 0x00000007: quad list sequential |