v3d: Skip printing sub-id or pad fields in CLIF dumping.
authorEric Anholt <eric@anholt.net>
Wed, 27 Jun 2018 22:42:10 +0000 (15:42 -0700)
committerEric Anholt <eric@anholt.net>
Sat, 28 Jul 2018 01:00:48 +0000 (18:00 -0700)
The parser doesn't expect them, so our fields would end up mismatched.
They're not really useful in console output, either.

src/broadcom/cle/v3d_decoder.c

index ed39ec48fc5d56e341b640c33991081961a1bc85..7eb963fcf1879facaae10ef34515f022da0ec4e4 100644 (file)
@@ -960,6 +960,14 @@ v3d_print_group(struct clif_dump *clif, struct v3d_group *group,
 
         v3d_field_iterator_init(&iter, group, p);
         while (v3d_field_iterator_next(clif, &iter)) {
+                /* Clif parsing uses the packet name, and expects no
+                 * sub-id.
+                 */
+                if (strcmp(iter.field->name, "sub-id") == 0 ||
+                    strcmp(iter.field->name, "unused") == 0 ||
+                    strcmp(iter.field->name, "Pad") == 0)
+                        continue;
+
                 fprintf(clif->out, "    %s: %s\n", iter.name, iter.value);
                 if (iter.struct_desc) {
                         uint64_t struct_offset = offset + iter.offset;