From 71c7e9bea154b46a4f5613a4f59eea9df11e42fa Mon Sep 17 00:00:00 2001
From: Eric Anholt <eric@anholt.net>
Date: Sat, 27 Jan 2018 18:45:35 +1100
Subject: [PATCH] broadcom/vc5: Enable CLIF dumping of V3D 4.2.

---
 src/broadcom/Makefile.vc5.am     | 4 ++++
 src/broadcom/clif/clif_private.h | 5 +++++
 src/broadcom/meson.build         | 2 +-
 3 files changed, 10 insertions(+), 1 deletion(-)

diff --git a/src/broadcom/Makefile.vc5.am b/src/broadcom/Makefile.vc5.am
index d07f071346c..c56cf892287 100644
--- a/src/broadcom/Makefile.vc5.am
+++ b/src/broadcom/Makefile.vc5.am
@@ -1,6 +1,7 @@
 noinst_LTLIBRARIES += libbroadcom.la
 noinst_LTLIBRARIES += libbroadcom_v33.la
 noinst_LTLIBRARIES += libbroadcom_v41.la
+noinst_LTLIBRARIES += libbroadcom_v42.la
 
 if USE_VC5_SIMULATOR
 AM_CFLAGS += $(VC5_SIMULATOR_CFLAGS)
@@ -13,6 +14,9 @@ libbroadcom_v33_la_CFLAGS = -DV3D_VERSION=33
 libbroadcom_v41_la_SOURCES = $(BROADCOM_PER_VERSION_SOURCES)
 libbroadcom_v41_la_CFLAGS = -DV3D_VERSION=41
 
+libbroadcom_v42_la_SOURCES = $(BROADCOM_PER_VERSION_SOURCES)
+libbroadcom_v42_la_CFLAGS = -DV3D_VERSION=42
+
 libbroadcom_la_SOURCES = $(BROADCOM_FILES)
 
 check_PROGRAMS += \
diff --git a/src/broadcom/clif/clif_private.h b/src/broadcom/clif/clif_private.h
index eac61eaa95b..87de17697d8 100644
--- a/src/broadcom/clif/clif_private.h
+++ b/src/broadcom/clif/clif_private.h
@@ -77,6 +77,11 @@ bool v3d41_clif_dump_packet(struct clif_dump *clif, uint32_t offset,
 void v3d41_clif_dump_gl_shader_state_record(struct clif_dump *clif,
                                             struct reloc_worklist_entry *reloc,
                                             void *vaddr);
+bool v3d42_clif_dump_packet(struct clif_dump *clif, uint32_t offset,
+                            const uint8_t *cl, uint32_t *size);
+void v3d42_clif_dump_gl_shader_state_record(struct clif_dump *clif,
+                                            struct reloc_worklist_entry *reloc,
+                                            void *vaddr);
 
 static inline void
 out(struct clif_dump *clif, const char *fmt, ...)
diff --git a/src/broadcom/meson.build b/src/broadcom/meson.build
index 787529d2505..6c8ea613449 100644
--- a/src/broadcom/meson.build
+++ b/src/broadcom/meson.build
@@ -22,7 +22,7 @@ inc_broadcom = include_directories('.', 'cle')
 
 subdir('cle')
 
-vc5_versions = ['33', '41']
+vc5_versions = ['33', '41', '42']
 
 if with_gallium_vc5
   subdir('compiler')
-- 
2.30.2