From 96d3e8f134fb047fb4883737da55ff491d3ee585 Mon Sep 17 00:00:00 2001 From: Eric Anholt Date: Sat, 27 Jan 2018 18:05:58 +1100 Subject: [PATCH] broadcom/vc5: Add XML for V3D 4.2. --- src/broadcom/Android.genxml.mk | 5 + src/broadcom/Makefile.sources | 2 + src/broadcom/cle/meson.build | 1 + src/broadcom/cle/v3d_packet_v42.xml | 1052 +++++++++++++++++++++++++++ src/broadcom/cle/v3dx_pack.h | 2 + src/broadcom/common/v3d_macros.h | 3 + 6 files changed, 1065 insertions(+) create mode 100644 src/broadcom/cle/v3d_packet_v42.xml diff --git a/src/broadcom/Android.genxml.mk b/src/broadcom/Android.genxml.mk index 77b83ed7924..fc5494fb673 100644 --- a/src/broadcom/Android.genxml.mk +++ b/src/broadcom/Android.genxml.mk @@ -60,6 +60,11 @@ $(intermediates)/broadcom/cle/v3d_packet_v41_pack.h: PRIVATE_XML := $(LOCAL_PATH $(intermediates)/broadcom/cle/v3d_packet_v41_pack.h: $(LOCAL_PATH)/cle/v3d_packet_v41.xml $(LOCAL_PATH)/cle/gen_pack_header.py $(call header-gen) +$(intermediates)/broadcom/cle/v3d_packet_v42_pack.h: PRIVATE_SCRIPT := $(MESA_PYTHON2) $(LOCAL_PATH)/cle/gen_pack_header.py +$(intermediates)/broadcom/cle/v3d_packet_v42_pack.h: PRIVATE_XML := $(LOCAL_PATH)/cle/v3d_packet_v42.xml +$(intermediates)/broadcom/cle/v3d_packet_v42_pack.h: $(LOCAL_PATH)/cle/v3d_packet_v42.xml $(LOCAL_PATH)/cle/gen_pack_header.py + $(call header-gen) + $(intermediates)/broadcom/cle/v3d_xml.h: $(addprefix $(MESA_TOP)/src/broadcom/,$(BROADCOM_GENXML_XML_FILES)) $(MESA_TOP)/src/intel/genxml/gen_zipped_file.py @mkdir -p $(dir $@) @echo "Gen Header: $(PRIVATE_MODULE) <= $(notdir $(@))" diff --git a/src/broadcom/Makefile.sources b/src/broadcom/Makefile.sources index e2bd075fbd0..dc225b939d7 100644 --- a/src/broadcom/Makefile.sources +++ b/src/broadcom/Makefile.sources @@ -2,6 +2,7 @@ BROADCOM_GENXML_GENERATED_FILES = \ cle/v3d_packet_v21_pack.h \ cle/v3d_packet_v33_pack.h \ cle/v3d_packet_v41_pack.h \ + cle/v3d_packet_v42_pack.h \ cle/v3d_xml.h \ $() @@ -9,6 +10,7 @@ BROADCOM_GENXML_XML_FILES = \ cle/v3d_packet_v21.xml \ cle/v3d_packet_v33.xml \ cle/v3d_packet_v41.xml \ + cle/v3d_packet_v42.xml \ $() BROADCOM_FILES = \ diff --git a/src/broadcom/cle/meson.build b/src/broadcom/cle/meson.build index d3838a0ff00..b1ff8322524 100644 --- a/src/broadcom/cle/meson.build +++ b/src/broadcom/cle/meson.build @@ -22,6 +22,7 @@ v3d_versions = [ 21, 33, 41, + 42, ] v3d_xml_files = [] diff --git a/src/broadcom/cle/v3d_packet_v42.xml b/src/broadcom/cle/v3d_packet_v42.xml new file mode 100644 index 00000000000..e88e37299f1 --- /dev/null +++ b/src/broadcom/cle/v3d_packet_v42.xml @@ -0,0 +1,1052 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/broadcom/cle/v3dx_pack.h b/src/broadcom/cle/v3dx_pack.h index af8ed0881f8..5762e5aaa70 100644 --- a/src/broadcom/cle/v3dx_pack.h +++ b/src/broadcom/cle/v3dx_pack.h @@ -35,6 +35,8 @@ # include "cle/v3d_packet_v33_pack.h" #elif (V3D_VERSION == 41) # include "cle/v3d_packet_v41_pack.h" +#elif (V3D_VERSION == 42) +# include "cle/v3d_packet_v42_pack.h" #else # error "Need to add a pack header include for this v3d version" #endif diff --git a/src/broadcom/common/v3d_macros.h b/src/broadcom/common/v3d_macros.h index 6ba8e7da10e..fe89398208a 100644 --- a/src/broadcom/common/v3d_macros.h +++ b/src/broadcom/common/v3d_macros.h @@ -38,6 +38,9 @@ #elif (V3D_VERSION == 41) # define V3DX(x) V3D41_##x # define v3dX(x) v3d41_##x +#elif (V3D_VERSION == 42) +# define V3DX(x) V3D42_##x +# define v3dX(x) v3d42_##x #else # error "Need to add prefixing macros for this v3d version" #endif -- 2.30.2