38 files changed, 196 insertions, 92 deletions

diff --git a/src/gallium/drivers/panfrost/include/meson.build b/src/gallium/drivers/panfrost/include/meson.build
deleted file mode 100644
index e69de29bb2d..00000000000
--- a/src/gallium/drivers/panfrost/include/meson.build
+++ /dev/null
diff --git a/src/gallium/drivers/panfrost/meson.build b/src/gallium/drivers/panfrost/meson.build
index f3067c6a784..7fdbddc0268 100644
--- a/src/gallium/drivers/panfrost/meson.build
+++ b/src/gallium/drivers/panfrost/meson.build
@@ -26,27 +26,10 @@ files_panfrost = files(
   'pan_resource.c',
   'pan_resource.h',
 
-  'midgard/midgard_compile.c',
-  'midgard/mir.c',
-  'midgard/midgard_print.c',
-  'midgard/midgard_schedule.c',
-  'midgard/midgard_emit.c',
-  'midgard/midgard_ra.c',
-  'midgard/midgard_ra_pipeline.c',
-  'midgard/midgard_liveness.c',
-  'midgard/midgard_ops.c',
-  'midgard/cppwrap.cpp',
-  'midgard/disassemble.c',
-
   'nir/nir_undef_to_zero.c',
   'nir/nir_lower_blend.c',
   'nir/nir_lower_framebuffer.c',
 
-  'bifrost/disassemble.c',
-
-  'pandecode/common.c',
-  'pandecode/decode.c',
-
   'pan_context.c',
   'pan_afbc.c',
   'pan_blit.c',
@@ -58,7 +41,6 @@ files_panfrost = files(
   'pan_blending.c',
   'pan_blend_shaders.c',
   'pan_blend_cso.c',
-  'pan_pretty_print.c',
   'pan_fragment.c',
   'pan_invocation.c',
   'pan_instancing.c',
@@ -75,9 +57,6 @@ panfrost_includes = [
   inc_include,
   inc_src,
   inc_panfrost,
-  include_directories('include'),
-  include_directories('midgard'),
-  include_directories('bifrost'),
 ]
 
 compile_args_panfrost = [
@@ -85,21 +64,9 @@ compile_args_panfrost = [
   '-Wno-pointer-arith'
 ]
 
-midgard_nir_algebraic_c = custom_target(
-  'midgard_nir_algebraic.c',
-  input : 'midgard/midgard_nir_algebraic.py',
-  output : 'midgard_nir_algebraic.c',
-  command : [
-    prog_python, '@INPUT@',
-    '-p', join_paths(meson.source_root(), 'src/compiler/nir/'),
-  ],
-  capture : true,
-  depend_files : nir_algebraic_py,
-)
-
 libpanfrost = static_library(
   'panfrost',
-  [files_panfrost, midgard_nir_algebraic_c],
+  files_panfrost,
   dependencies: [
     dep_thread,
     dep_libdrm,
@@ -111,58 +78,5 @@ libpanfrost = static_library(
 
 driver_panfrost = declare_dependency(
   compile_args : compile_args_panfrost,
-  link_with : [libpanfrost, libpanfrostwinsys, libpanfrost_shared],
-)
-
-files_bifrost = files(
-  'bifrost/disassemble.c',
-  'bifrost/cmdline.c',
-)
-
-bifrost_compiler = executable(
-  'bifrost_compiler',
-  [files_bifrost],
-  include_directories : [
-    inc_common,
-    inc_src,
-    inc_include,
-    inc_gallium,
-    inc_gallium_aux,
-    include_directories('bifrost')
-    ],
-  dependencies : [
-    dep_thread,
-    idep_nir
-  ],
-  link_with : [
-    libgallium,
-    libglsl_standalone,
-    libmesa_util
-  ],
-  build_by_default : true
-)
-
-files_pandecode = files(
-  'pandecode/cmdline.c',
-  'pandecode/common.c',
-  'pandecode/decode.c',
-
-  'pan_pretty_print.c',
-
-  'midgard/disassemble.c',
-  'midgard/midgard_ops.c',
-  'bifrost/disassemble.c',
-)
-
-pandecode = executable(
-  'pandecode',
-  files_pandecode,
-  include_directories : panfrost_includes,
-  dependencies : [
-    dep_thread,
-  ],
-  link_with : [
-    libmesa_util
-  ],
-  build_by_default : true
+  link_with : [libpanfrost, libpanfrostwinsys, libpanfrost_shared, libpanfrost_midgard, libpanfrost_bifrost, libpanfrost_decode],
 )
diff --git a/src/gallium/drivers/panfrost/bifrost/bifrost.h b/src/panfrost/bifrost/bifrost.h
index aa382b43be7..aa382b43be7 100644
--- a/src/gallium/drivers/panfrost/bifrost/bifrost.h
+++ b/src/panfrost/bifrost/bifrost.h
diff --git a/src/gallium/drivers/panfrost/bifrost/cmdline.c b/src/panfrost/bifrost/cmdline.c
index 9fd7094ebe1..9fd7094ebe1 100644
--- a/src/gallium/drivers/panfrost/bifrost/cmdline.c
+++ b/src/panfrost/bifrost/cmdline.c
diff --git a/src/gallium/drivers/panfrost/bifrost/disassemble.c b/src/panfrost/bifrost/disassemble.c
index 03ade19a689..03ade19a689 100644
--- a/src/gallium/drivers/panfrost/bifrost/disassemble.c
+++ b/src/panfrost/bifrost/disassemble.c
diff --git a/src/gallium/drivers/panfrost/bifrost/disassemble.h b/src/panfrost/bifrost/disassemble.h
index 7c22d43ac77..7c22d43ac77 100644
--- a/src/gallium/drivers/panfrost/bifrost/disassemble.h
+++ b/src/panfrost/bifrost/disassemble.h
diff --git a/src/panfrost/bifrost/meson.build b/src/panfrost/bifrost/meson.build
new file mode 100644
index 00000000000..1258cd04caf
--- /dev/null
+++ b/src/panfrost/bifrost/meson.build
@@ -0,0 +1,33 @@
+# Copyright © 2018 Rob Clark
+# Copyright © 2019 Collabora
+
+# Permission is hereby granted, free of charge, to any person obtaining a copy
+# of this software and associated documentation files (the "Software"), to deal
+# in the Software without restriction, including without limitation the rights
+# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+# copies of the Software, and to permit persons to whom the Software is
+# furnished to do so, subject to the following conditions:
+
+# The above copyright notice and this permission notice shall be included in
+# all copies or substantial portions of the Software.
+
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+# SOFTWARE.
+
+libpanfrost_bifrost_files = files(
+  'disassemble.c',
+)
+
+libpanfrost_bifrost = static_library(
+  'panfrost_bifrost',
+  [libpanfrost_bifrost_files],
+  include_directories : [inc_common],
+  c_args : [c_vis_args, no_override_init_args],
+  cpp_args : [cpp_vis_args],
+  build_by_default : false,
+)
diff --git a/src/gallium/drivers/panfrost/include/panfrost-job.h b/src/panfrost/include/panfrost-job.h
index 0c559309946..0c559309946 100644
--- a/src/gallium/drivers/panfrost/include/panfrost-job.h
+++ b/src/panfrost/include/panfrost-job.h
diff --git a/src/gallium/drivers/panfrost/include/panfrost-misc.h b/src/panfrost/include/panfrost-misc.h
index 82363d8730b..82363d8730b 100644
--- a/src/gallium/drivers/panfrost/include/panfrost-misc.h
+++ b/src/panfrost/include/panfrost-misc.h
diff --git a/src/panfrost/meson.build b/src/panfrost/meson.build
index 6b167d04b9c..9c12ff8fd8e 100644
--- a/src/panfrost/meson.build
+++ b/src/panfrost/meson.build
@@ -19,6 +19,64 @@
 # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 # SOFTWARE.
 
-inc_panfrost = include_directories(['.', 'shared'])
+inc_panfrost_hw = include_directories([
+   'include'
+])
+
+inc_panfrost = include_directories([
+   '.', 'include', 'shared', 'midgard', 'bifrost'
+])
 
 subdir('shared')
+subdir('midgard')
+subdir('bifrost')
+subdir('pandecode')
+
+files_pandecode = files(
+  'pandecode/cmdline.c',
+  'pandecode/common.c',
+  'pandecode/decode.c',
+  'pandecode/pan_pretty_print.c',
+
+  'midgard/disassemble.c',
+  'midgard/midgard_ops.c',
+  'bifrost/disassemble.c',
+)
+
+pandecode = executable(
+  'pandecoder',
+  files_pandecode,
+  include_directories : [inc_common, inc_include, inc_src, inc_panfrost],
+  dependencies : [
+    dep_thread,
+  ],
+  link_with : [
+    libmesa_util
+  ],
+  build_by_default : true
+)
+
+files_bifrost = files(
+  'bifrost/cmdline.c',
+)
+
+bifrost_compiler = executable(
+  'bifrost_compiler',
+  [files_bifrost],
+  include_directories : [
+    inc_common,
+    inc_include,
+    inc_src,
+    inc_panfrost,
+ ],
+  dependencies : [
+    dep_thread,
+    idep_nir
+  ],
+  link_with : [
+    libglsl_standalone,
+    libmesa_util,
+    libpanfrost_bifrost
+  ],
+  build_by_default : true
+)
diff --git a/src/gallium/drivers/panfrost/midgard/compiler.h b/src/panfrost/midgard/compiler.h
index 79fe7dfc78a..79fe7dfc78a 100644
--- a/src/gallium/drivers/panfrost/midgard/compiler.h
+++ b/src/panfrost/midgard/compiler.h
diff --git a/src/gallium/drivers/panfrost/midgard/cppwrap.cpp b/src/panfrost/midgard/cppwrap.cpp
index cf2ca3b7a11..cf2ca3b7a11 100644
--- a/src/gallium/drivers/panfrost/midgard/cppwrap.cpp
+++ b/src/panfrost/midgard/cppwrap.cpp
diff --git a/src/gallium/drivers/panfrost/midgard/disassemble.c b/src/panfrost/midgard/disassemble.c
index bed803162f3..bed803162f3 100644
--- a/src/gallium/drivers/panfrost/midgard/disassemble.c
+++ b/src/panfrost/midgard/disassemble.c
diff --git a/src/gallium/drivers/panfrost/midgard/disassemble.h b/src/panfrost/midgard/disassemble.h
index ab1837c201e..ab1837c201e 100644
--- a/src/gallium/drivers/panfrost/midgard/disassemble.h
+++ b/src/panfrost/midgard/disassemble.h
diff --git a/src/gallium/drivers/panfrost/midgard/helpers.h b/src/panfrost/midgard/helpers.h
index ef854dc60c1..ef854dc60c1 100644
--- a/src/gallium/drivers/panfrost/midgard/helpers.h
+++ b/src/panfrost/midgard/helpers.h
diff --git a/src/panfrost/midgard/meson.build b/src/panfrost/midgard/meson.build
new file mode 100644
index 00000000000..cbe26004e2d
--- /dev/null
+++ b/src/panfrost/midgard/meson.build
@@ -0,0 +1,63 @@
+# Copyright © 2018 Rob Clark
+# Copyright © 2019 Collabora
+
+# Permission is hereby granted, free of charge, to any person obtaining a copy
+# of this software and associated documentation files (the "Software"), to deal
+# in the Software without restriction, including without limitation the rights
+# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+# copies of the Software, and to permit persons to whom the Software is
+# furnished to do so, subject to the following conditions:
+
+# The above copyright notice and this permission notice shall be included in
+# all copies or substantial portions of the Software.
+
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+# SOFTWARE.
+
+libpanfrost_midgard_files = files(
+  'midgard_compile.c',
+  'mir.c',
+  'midgard_print.c',
+  'midgard_schedule.c',
+  'midgard_emit.c',
+  'midgard_ra.c',
+  'midgard_ra_pipeline.c',
+  'midgard_liveness.c',
+  'midgard_ops.c',
+  'cppwrap.cpp',
+  'disassemble.c',
+)
+
+midgard_nir_algebraic_c = custom_target(
+  'midgard_nir_algebraic.c',
+  input : 'midgard_nir_algebraic.py',
+  output : 'midgard_nir_algebraic.c',
+  command : [
+    prog_python, '@INPUT@',
+    '-p', join_paths(meson.source_root(), 'src/compiler/nir/'),
+  ],
+  capture : true,
+  depend_files : nir_algebraic_py,
+)
+
+libpanfrost_midgard = static_library(
+  'panfrost_midgard',
+  [libpanfrost_midgard_files, midgard_nir_algebraic_c],
+  include_directories : [
+   inc_common,
+   inc_include,
+   inc_src,
+   inc_panfrost_hw,
+  ],
+  dependencies: [
+   idep_nir
+  ],
+  c_args : [c_vis_args, no_override_init_args],
+  cpp_args : [cpp_vis_args],
+  build_by_default : false,
+)
diff --git a/src/gallium/drivers/panfrost/midgard/midgard-parse.h b/src/panfrost/midgard/midgard-parse.h
index 5d134839406..5d134839406 100644
--- a/src/gallium/drivers/panfrost/midgard/midgard-parse.h
+++ b/src/panfrost/midgard/midgard-parse.h
diff --git a/src/gallium/drivers/panfrost/midgard/midgard.h b/src/panfrost/midgard/midgard.h
index 5953214c599..5953214c599 100644
--- a/src/gallium/drivers/panfrost/midgard/midgard.h
+++ b/src/panfrost/midgard/midgard.h
diff --git a/src/gallium/drivers/panfrost/midgard/midgard_compile.c b/src/panfrost/midgard/midgard_compile.c
index 9c1349094bd..9c1349094bd 100644
--- a/src/gallium/drivers/panfrost/midgard/midgard_compile.c
+++ b/src/panfrost/midgard/midgard_compile.c
diff --git a/src/gallium/drivers/panfrost/midgard/midgard_compile.h b/src/panfrost/midgard/midgard_compile.h
index 147494b8e8a..147494b8e8a 100644
--- a/src/gallium/drivers/panfrost/midgard/midgard_compile.h
+++ b/src/panfrost/midgard/midgard_compile.h
diff --git a/src/gallium/drivers/panfrost/midgard/midgard_emit.c b/src/panfrost/midgard/midgard_emit.c
index 3522e77d5b1..3522e77d5b1 100644
--- a/src/gallium/drivers/panfrost/midgard/midgard_emit.c
+++ b/src/panfrost/midgard/midgard_emit.c
diff --git a/src/gallium/drivers/panfrost/midgard/midgard_liveness.c b/src/panfrost/midgard/midgard_liveness.c
index a18d8b9f8ad..a18d8b9f8ad 100644
--- a/src/gallium/drivers/panfrost/midgard/midgard_liveness.c
+++ b/src/panfrost/midgard/midgard_liveness.c
diff --git a/src/gallium/drivers/panfrost/midgard/midgard_nir.h b/src/panfrost/midgard/midgard_nir.h
index 85eadd34631..85eadd34631 100644
--- a/src/gallium/drivers/panfrost/midgard/midgard_nir.h
+++ b/src/panfrost/midgard/midgard_nir.h
diff --git a/src/gallium/drivers/panfrost/midgard/midgard_nir_algebraic.py b/src/panfrost/midgard/midgard_nir_algebraic.py
index faf83364c3a..faf83364c3a 100644
--- a/src/gallium/drivers/panfrost/midgard/midgard_nir_algebraic.py
+++ b/src/panfrost/midgard/midgard_nir_algebraic.py
diff --git a/src/gallium/drivers/panfrost/midgard/midgard_ops.c b/src/panfrost/midgard/midgard_ops.c
index ccd750cff83..ccd750cff83 100644
--- a/src/gallium/drivers/panfrost/midgard/midgard_ops.c
+++ b/src/panfrost/midgard/midgard_ops.c
diff --git a/src/gallium/drivers/panfrost/midgard/midgard_ops.h b/src/panfrost/midgard/midgard_ops.h
index 64c91a5bcac..64c91a5bcac 100644
--- a/src/gallium/drivers/panfrost/midgard/midgard_ops.h
+++ b/src/panfrost/midgard/midgard_ops.h
diff --git a/src/gallium/drivers/panfrost/midgard/midgard_print.c b/src/panfrost/midgard/midgard_print.c
index 6e10429ccee..6e10429ccee 100644
--- a/src/gallium/drivers/panfrost/midgard/midgard_print.c
+++ b/src/panfrost/midgard/midgard_print.c
diff --git a/src/gallium/drivers/panfrost/midgard/midgard_ra.c b/src/panfrost/midgard/midgard_ra.c
index cfe091326ed..cfe091326ed 100644
--- a/src/gallium/drivers/panfrost/midgard/midgard_ra.c
+++ b/src/panfrost/midgard/midgard_ra.c
diff --git a/src/gallium/drivers/panfrost/midgard/midgard_ra_pipeline.c b/src/panfrost/midgard/midgard_ra_pipeline.c
index cd64bdf29e5..cd64bdf29e5 100644
--- a/src/gallium/drivers/panfrost/midgard/midgard_ra_pipeline.c
+++ b/src/panfrost/midgard/midgard_ra_pipeline.c
diff --git a/src/gallium/drivers/panfrost/midgard/midgard_schedule.c b/src/panfrost/midgard/midgard_schedule.c
index 7a3841e4d44..7a3841e4d44 100644
--- a/src/gallium/drivers/panfrost/midgard/midgard_schedule.c
+++ b/src/panfrost/midgard/midgard_schedule.c
diff --git a/src/gallium/drivers/panfrost/midgard/mir.c b/src/panfrost/midgard/mir.c
index 6adc1350c0a..6adc1350c0a 100644
--- a/src/gallium/drivers/panfrost/midgard/mir.c
+++ b/src/panfrost/midgard/mir.c
diff --git a/src/gallium/drivers/panfrost/pandecode/cmdline.c b/src/panfrost/pandecode/cmdline.c
index 38053aa1072..38053aa1072 100644
--- a/src/gallium/drivers/panfrost/pandecode/cmdline.c
+++ b/src/panfrost/pandecode/cmdline.c
diff --git a/src/gallium/drivers/panfrost/pandecode/common.c b/src/panfrost/pandecode/common.c
index 6196379c969..6196379c969 100644
--- a/src/gallium/drivers/panfrost/pandecode/common.c
+++ b/src/panfrost/pandecode/common.c
diff --git a/src/gallium/drivers/panfrost/pandecode/decode.c b/src/panfrost/pandecode/decode.c
index 1326fd1a916..61b8914388e 100644
--- a/src/gallium/drivers/panfrost/pandecode/decode.c
+++ b/src/panfrost/pandecode/decode.c
@@ -32,9 +32,10 @@
 #include "decode.h"
 #include "util/u_math.h"
 
-#include "../pan_pretty_print.h"
-#include "../midgard/disassemble.h"
-#include "../bifrost/disassemble.h"
+#include "pan_pretty_print.h"
+#include "midgard/disassemble.h"
+#include "bifrost/disassemble.h"
+
 int pandecode_replay_jc(mali_ptr jc_gpu_va, bool bifrost);
 
 #define MEMORY_PROP(obj, p) {\
diff --git a/src/gallium/drivers/panfrost/pandecode/decode.h b/src/panfrost/pandecode/decode.h
index 9c788bbabcc..9c788bbabcc 100644
--- a/src/gallium/drivers/panfrost/pandecode/decode.h
+++ b/src/panfrost/pandecode/decode.h
diff --git a/src/panfrost/pandecode/meson.build b/src/panfrost/pandecode/meson.build
new file mode 100644
index 00000000000..2c341a58cc4
--- /dev/null
+++ b/src/panfrost/pandecode/meson.build
@@ -0,0 +1,35 @@
+# Copyright © 2018 Rob Clark
+# Copyright © 2019 Collabora
+
+# Permission is hereby granted, free of charge, to any person obtaining a copy
+# of this software and associated documentation files (the "Software"), to deal
+# in the Software without restriction, including without limitation the rights
+# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+# copies of the Software, and to permit persons to whom the Software is
+# furnished to do so, subject to the following conditions:
+
+# The above copyright notice and this permission notice shall be included in
+# all copies or substantial portions of the Software.
+
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+# SOFTWARE.
+
+libpanfrost_decode_files = files(
+  'pan_pretty_print.c',
+  'common.c',
+  'decode.c',
+)
+
+libpanfrost_decode = static_library(
+  'panfrost_decode',
+  [libpanfrost_decode_files],
+  include_directories : [inc_common, inc_panfrost],
+  c_args : [c_vis_args, no_override_init_args],
+  cpp_args : [cpp_vis_args],
+  build_by_default : false,
+)
diff --git a/src/gallium/drivers/panfrost/pan_pretty_print.c b/src/panfrost/pandecode/pan_pretty_print.c
index c59bfa1da5a..c59bfa1da5a 100644
--- a/src/gallium/drivers/panfrost/pan_pretty_print.c
+++ b/src/panfrost/pandecode/pan_pretty_print.c
diff --git a/src/gallium/drivers/panfrost/pan_pretty_print.h b/src/panfrost/pandecode/pan_pretty_print.h
index 22dca4abbf6..22dca4abbf6 100644
--- a/src/gallium/drivers/panfrost/pan_pretty_print.h
+++ b/src/panfrost/pandecode/pan_pretty_print.h