[Mesa-dev] [PATCH 2/3] meson: Add support for the pl111 driver.

[Eric Anholt]

---
 meson.build                              |  2 ++
 meson_options.txt                        |  2 +-
 src/gallium/meson.build                  |  4 +++-
 src/gallium/targets/dri/meson.build      |  5 +++++
 src/gallium/winsys/pl111/drm/meson.build | 30 ++++++++++++++++++++++++++++++
 5 files changed, 41 insertions(+), 2 deletions(-)
 create mode 100644 src/gallium/winsys/pl111/drm/meson.build

diff --git a/meson.build b/meson.build
index f538cf79bb4f..9967df08e017 100644
--- a/meson.build
+++ b/meson.build
@@ -91,6 +91,7 @@ if _drivers != ''
 endif
 
 with_gallium = false
+with_gallium_pl111 = false
 with_gallium_radeonsi = false
 with_gallium_nouveau = false
 with_gallium_softpipe = false
@@ -98,6 +99,7 @@ with_gallium_vc4 = false
 _drivers = get_option('gallium-drivers')
 if _drivers != ''
   _split = _drivers.split(',')
+  with_gallium_vc4 = _split.contains('pl111')
   with_gallium_radeonsi = _split.contains('radeonsi')
   with_gallium_nouveau = _split.contains('nouveau')
   with_gallium_softpipe = _split.contains('swrast')
diff --git a/meson_options.txt b/meson_options.txt
index 51a180501289..8fd00d41b45c 100644
--- a/meson_options.txt
+++ b/meson_options.txt
@@ -46,7 +46,7 @@ option(
 option(
   'gallium-drivers',
   type : 'string',
-  value : 'radeonsi,nouveau,swrast,vc4',
+  value : 'pl111,radeonsi,nouveau,swrast,vc4',
   description : 'comma separated list of gallium drivers to build.'
 )
 option(
diff --git a/src/gallium/meson.build b/src/gallium/meson.build
index 3c5756c0a7f9..b563a5ff51cc 100644
--- a/src/gallium/meson.build
+++ b/src/gallium/meson.build
@@ -40,6 +40,9 @@ subdir('winsys/sw/null')
 subdir('winsys/sw/dri')
 subdir('winsys/sw/kms-dri')
 subdir('winsys/sw/wrapper')
+if with_gallium_vc4
+  subdir('winsys/pl111/drm')
+endif
 subdir('winsys/radeon/drm')
 subdir('winsys/amdgpu/drm')
 subdir('winsys/nouveau/drm')
@@ -54,7 +57,6 @@ subdir('state_trackers/dri')
 # TODO: r600
 # TODO: etnaviv
 # TODO: IMX
-# TODO: PL111
 # TODO: SWR
 # TODO: virgl
 # TODO: winsys/sw/xlib
diff --git a/src/gallium/targets/dri/meson.build b/src/gallium/targets/dri/meson.build
index 02ea2e26bcd5..fd758e1b60a7 100644
--- a/src/gallium/targets/dri/meson.build
+++ b/src/gallium/targets/dri/meson.build
@@ -51,6 +51,11 @@ if with_gallium_drisw_kms
   gallium_dri_link_with += libswkmsdri
 endif
 
+if with_gallium_pl111
+  gallium_dri_c_args += '-DGALLIUM_PL111'
+  gallium_dri_link_with += [libpl111winsys]
+  gallium_dri_drivers += 'pl111_dri.so'
+endif
 if with_gallium_radeonsi
   gallium_dri_c_args += '-DGALLIUM_RADEONSI'
   gallium_dri_link_with += [
diff --git a/src/gallium/winsys/pl111/drm/meson.build b/src/gallium/winsys/pl111/drm/meson.build
new file mode 100644
index 000000000000..952c0b46700f
--- /dev/null
+++ b/src/gallium/winsys/pl111/drm/meson.build
@@ -0,0 +1,30 @@
+# Copyright © 2017 Broadcom
+#
+# 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.
+
+libpl111winsys = static_library(
+  'pl111winsys',
+  files('pl111_drm_winsys.c'),
+  include_directories : [
+    inc_src, inc_include,
+    inc_gallium, inc_gallium_aux, inc_gallium_winsys,
+  ],
+  c_args : [c_vis_args],
+  dependencies: dep_libdrm,
+)
-- 
2.14.2