summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorEric Anholt <[email protected]>2017-10-12 18:39:08 -0700
committerEric Anholt <[email protected]>2017-10-17 13:41:59 -0700
commit1918c9b1627d5403e2efbffa03441c4b7d61a63e (patch)
tree780c115b218f47fd4b39d065036e698b53f9c080 /src
parent1ae8018a6af81eec4832a57d9d0346aa3dd98d28 (diff)
meson: Add support for the pl111 driver.
Reviewed-by: Dylan Baker <[email protected]>
Diffstat (limited to 'src')
-rw-r--r--src/gallium/meson.build4
-rw-r--r--src/gallium/targets/dri/meson.build5
-rw-r--r--src/gallium/winsys/pl111/drm/meson.build30
3 files changed, 38 insertions, 1 deletions
diff --git a/src/gallium/meson.build b/src/gallium/meson.build
index 3c5756c0a7f..b563a5ff51c 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 02ea2e26bcd..fd758e1b60a 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 00000000000..952c0b46700
--- /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,
+)