intel/decode: fix the reference file for
authorBen Widawsky <ben@bwidawsk.net>
Wed, 27 Jun 2012 17:10:53 +0000 (10:10 -0700)
committerBen Widawsky <ben@bwidawsk.net>
Wed, 27 Jun 2012 17:22:37 +0000 (10:22 -0700)
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>
configure.ac
intel/intel_decode.c
intel/tests/gen7-3d.batch-ref.txt

index f7bea3511d5ec1bb06e752fa422c94c4c4552160..1e23b3652c78b83632dad961dbd8d3d267ab01de 100644 (file)
@@ -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])
 
index 909ae7761204e9acc6cb86045efc4f7418f5c7bb..19a8d368318b8291be17386e3bd3fd3efc8deff1 100644 (file)
@@ -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++;
index be3c85e6ffd90d4ca5a2bd68923e79b22cc47825..cd2dfc4c3405390db042e1c6caa162f46511b0a7 100644 (file)
 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