geemili
/
drm
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

intel/decode: fix the reference file for 

I mistakenly "fixed" a bad decode with

commit 7d0a1d5ebb
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>
main
Ben Widawsky 2012-06-27 10:10:53 -07:00
parent df5cc69dab
commit a7805194b7
3 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
configure.ac
View 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])

4
intel/intel_decode.c
View 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++;

4
intel/tests/gen7-3d.batch-ref.txt
View File

@ -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