From b42a05b43655cab33b3f321f174ee95b1a0b7fd0 Mon Sep 17 00:00:00 2001 From: Jordan Justen Date: Fri, 12 Oct 2018 16:18:37 -0700 Subject: [PATCH] intel/genxml: Build gen12 genxml Signed-off-by: Jordan Justen Reviewed-by: Kenneth Graunke Reviewed-by: Lionel Landwerlin --- src/intel/Makefile.sources | 6 ++++-- src/intel/genxml/genX_pack.h | 2 ++ src/intel/genxml/gen_bits_header.py | 1 + src/intel/genxml/gen_macros.h | 3 +++ src/intel/genxml/meson.build | 1 + 5 files changed, 11 insertions(+), 2 deletions(-) diff --git a/src/intel/Makefile.sources b/src/intel/Makefile.sources index 86d900a0bac..79f86a59806 100644 --- a/src/intel/Makefile.sources +++ b/src/intel/Makefile.sources @@ -143,7 +143,8 @@ GENXML_XML_FILES = \ genxml/gen8.xml \ genxml/gen9.xml \ genxml/gen10.xml \ - genxml/gen11.xml + genxml/gen11.xml \ + genxml/gen12.xml GENXML_GENERATED_PACK_FILES = \ genxml/gen4_pack.h \ @@ -155,7 +156,8 @@ GENXML_GENERATED_PACK_FILES = \ genxml/gen8_pack.h \ genxml/gen9_pack.h \ genxml/gen10_pack.h \ - genxml/gen11_pack.h + genxml/gen11_pack.h \ + genxml/gen12_pack.h GENXML_GENERATED_FILES = \ $(GENXML_GENERATED_PACK_FILES) \ diff --git a/src/intel/genxml/genX_pack.h b/src/intel/genxml/genX_pack.h index cf39973db14..bddab6754f4 100644 --- a/src/intel/genxml/genX_pack.h +++ b/src/intel/genxml/genX_pack.h @@ -48,6 +48,8 @@ # include "genxml/gen10_pack.h" #elif (GEN_VERSIONx10 == 110) # include "genxml/gen11_pack.h" +#elif (GEN_VERSIONx10 == 120) +# include "genxml/gen12_pack.h" #else # error "Need to add a pack header include for this gen" #endif diff --git a/src/intel/genxml/gen_bits_header.py b/src/intel/genxml/gen_bits_header.py index 6dd0d7c6b75..38e9a6c74f1 100644 --- a/src/intel/genxml/gen_bits_header.py +++ b/src/intel/genxml/gen_bits_header.py @@ -80,6 +80,7 @@ static inline uint32_t ATTRIBUTE_PURE ${item.token_name}_${prop}(const struct gen_device_info *devinfo) { switch (devinfo->gen) { + case 12: return ${item.get_prop(prop, 12)}; case 11: return ${item.get_prop(prop, 11)}; case 10: return ${item.get_prop(prop, 10)}; case 9: return ${item.get_prop(prop, 9)}; diff --git a/src/intel/genxml/gen_macros.h b/src/intel/genxml/gen_macros.h index 43449a41a46..9d0172d041c 100644 --- a/src/intel/genxml/gen_macros.h +++ b/src/intel/genxml/gen_macros.h @@ -91,6 +91,9 @@ #elif (GEN_VERSIONx10 == 110) # define GENX(X) GEN11_##X # define genX(x) gen11_##x +#elif (GEN_VERSIONx10 == 120) +# define GENX(X) GEN12_##X +# define genX(x) gen12_##x #else # error "Need to add prefixing macros for this gen" #endif diff --git a/src/intel/genxml/meson.build b/src/intel/genxml/meson.build index 10d3149b8f5..60ef69ca53c 100644 --- a/src/intel/genxml/meson.build +++ b/src/intel/genxml/meson.build @@ -29,6 +29,7 @@ gen_xml_files = [ 'gen9.xml', 'gen10.xml', 'gen11.xml', + 'gen12.xml', ] genX_xml_h = custom_target( -- 2.30.2