summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorStefan Schake <stschake@gmail.com>2018-04-25 00:00:57 +0200
committerEric Anholt <eric@anholt.net>2018-05-17 16:04:24 +0100
commit4fc0ebdff55419965919e4d6bf3c7f7f2759f7aa (patch)
treefc89197961c19334136146a202dcde660b97cb0e
parent580d1f4c607bc6cd5bf24f9d303a502d6d9dcaec (diff)
broadcom/vc4: Bump libdrm requirement
Require a version of libdrm with syncobj support. v2: Don't require a libdrm_vc4, just bump core libdrm if vc4 enabled (by anholt) Signed-off-by: Stefan Schake <stschake@gmail.com> Reviewed-by: Eric Anholt <eric@anholt.net>
-rw-r--r--configure.ac2
-rw-r--r--meson.build6
2 files changed, 8 insertions, 0 deletions
diff --git a/configure.ac b/configure.ac
index 681696e7894..401025bf2ef 100644
--- a/configure.ac
+++ b/configure.ac
@@ -80,6 +80,7 @@ LIBDRM_NVVIEUX_REQUIRED=2.4.66
LIBDRM_NOUVEAU_REQUIRED=2.4.66
LIBDRM_FREEDRENO_REQUIRED=2.4.92
LIBDRM_ETNAVIV_REQUIRED=2.4.89
+LIBDRM_VC4_REQUIRED=2.4.89
dnl Versions for external dependencies
DRI2PROTO_REQUIRED=2.8
@@ -2727,6 +2728,7 @@ if test -n "$with_gallium_drivers"; then
;;
xvc4)
HAVE_GALLIUM_VC4=yes
+ PKG_CHECK_MODULES([VC4], [libdrm >= $LIBDRM_VC4_REQUIRED])
PKG_CHECK_MODULES([SIMPENROSE], [simpenrose],
[USE_VC4_SIMULATOR=yes;
diff --git a/meson.build b/meson.build
index b8ebda9cdc7..0f88ddfe8e7 100644
--- a/meson.build
+++ b/meson.build
@@ -1055,6 +1055,12 @@ _libdrm_checks = [
['freedreno', with_gallium_freedreno],
]
+# VC4 only needs core libdrm support of this version, not a libdrm_vc4
+# library.
+if with_gallium_vc4
+ _drm_ver = '2.4.89'
+endif
+
# Loop over the enables versions and get the highest libdrm requirement for all
# active drivers.
foreach d : _libdrm_checks