From 7c33372f82707d42293b1772d53ab50a2f56d6a3 Mon Sep 17 00:00:00 2001 From: Jordan Justen Date: Tue, 28 Mar 2017 11:55:26 -0700 Subject: [PATCH] intel/gen_decoder: Fix length for Media State/Object commands From BDW PRM, Volume 6: Command Stream Programming, 'Render Command Header Format'. Signed-off-by: Jordan Justen Reviewed-by: Lionel Landwerlin --- src/intel/common/gen_decoder.c | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/src/intel/common/gen_decoder.c b/src/intel/common/gen_decoder.c index 1ae78c8..1244f4c 100644 --- a/src/intel/common/gen_decoder.c +++ b/src/intel/common/gen_decoder.c @@ -697,8 +697,16 @@ gen_group_get_length(struct gen_group *group, const uint32_t *p) return field(h, 0, 7) + 2; case 1: return 1; - case 2: - return 2; + case 2: { + uint32_t opcode = field(h, 24, 26); + assert(opcode < 3 /* 3 and above currently reserved */); + if (opcode == 0) + return field(h, 0, 7) + 2; + else if (opcode < 3) + return field(h, 0, 15) + 2; + else + return 1; /* FIXME: if more opcodes are added */ + } case 3: return field(h, 0, 7) + 2; } -- 2.7.4