v3d: Add a separate flag for CLIF ABI output versus human-readable CLs.

[mesa.git] / src / broadcom / clif / clif_private.h

diff --git a/src/broadcom/clif/clif_private.h b/src/broadcom/clif/clif_private.h
index d8453d51c4163d7305566f5c329817486f09d946..8753ba229f8a3217220df5a57434796b033f2888 100644 (file)
--- a/src/broadcom/clif/clif_private.h
+++ b/src/broadcom/clif/clif_private.h
@@ -28,20 +28,35 @@
 #include <stdarg.h>
 #include "util/list.h"
 
+struct clif_bo {
+        const char *name;
+        uint32_t offset;
+        uint32_t size;
+        void *vaddr;
+};
+
 struct clif_dump {
         const struct v3d_device_info *devinfo;
-        bool (*lookup_vaddr)(void *data, uint32_t addr, void **vaddr);
         FILE *out;
-        /* Opaque data from the caller that is passed to the callbacks. */
-        void *data;
 
         struct v3d_spec *spec;
 
         /* List of struct reloc_worklist_entry */
         struct list_head worklist;
+
+        struct clif_bo *bo;
+        int bo_count;
+        int bo_array_size;
+
+        /**
+         * Flag to switch from CLIF ABI to slightly more human-readable
+         * output.
+         */
+        bool pretty;
 };
 
 enum reloc_worklist_type {
+        reloc_cl,
         reloc_gl_shader_state,
         reloc_generic_tile_list,
 };
@@ -53,6 +68,9 @@ struct reloc_worklist_entry {
         uint32_t addr;
 
         union {
+                struct {
+                        uint32_t end;
+                } cl;
                 struct {
                         uint32_t num_attrs;
                 } shader_state;
@@ -62,6 +80,9 @@ struct reloc_worklist_entry {
         };
 };
 
+struct clif_bo *
+clif_lookup_bo(struct clif_dump *clif, uint32_t addr);
+
 struct reloc_worklist_entry *
 clif_dump_add_address_to_worklist(struct clif_dump *clif,
                                   enum reloc_worklist_type type,
@@ -69,9 +90,10 @@ clif_dump_add_address_to_worklist(struct clif_dump *clif,
 
 bool v3d33_clif_dump_packet(struct clif_dump *clif, uint32_t offset,
                             const uint8_t *cl, uint32_t *size);
-void v3d33_clif_dump_gl_shader_state_record(struct clif_dump *clif,
-                                            struct reloc_worklist_entry *reloc,
-                                            void *vaddr);
+bool v3d41_clif_dump_packet(struct clif_dump *clif, uint32_t offset,
+                            const uint8_t *cl, uint32_t *size);
+bool v3d42_clif_dump_packet(struct clif_dump *clif, uint32_t offset,
+                            const uint8_t *cl, uint32_t *size);
 
 static inline void
 out(struct clif_dump *clif, const char *fmt, ...)