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 /intel/intel_decode.c | |
| 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>
Diffstat (limited to 'intel/intel_decode.c')
| -rw-r--r-- | intel/intel_decode.c | 4 |
1 files changed, 2 insertions, 2 deletions
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++; |