vl: Enable DRM by default.

If libdrm is found the pipe loader enables drm anyway, and that is
pretty much the only extra dependency this code has.

This enables creating libva display using a drm fd without having
to enable the DRM (GBM really) backend of EGL, which is completely
unrelated.

Leaving the X11 platforms alone as they would still result in the
additional inclusion of extra deps.

Reviewed-by: Marek Olšák <marek.olsak@amd.com>
Reviewed-by: Emil Velikov <emil.velikov@collabora.com>

diff --git a/meson.build b/meson.build
index cd994c73b72c3df7567ec4fe3e61c1a031b9ac38..1d32d909c95ed7152edd46c4a4210b28b019dda3 100644 (file)
--- a/meson.build
+++ b/meson.build
@@ -589,9 +589,9 @@ if not system_has_kms_drm
   else
     _va = 'false'
   endif
-elif not (with_platform_x11 or with_platform_drm)
+elif not (with_platform_x11 or dep_libdrm.found())
   if _va == 'true'
-    error('VA state tracker requires X11 or drm or wayland platform support.')
+    error('VA state tracker requires X11 platform support or libdrm.')
   else
     _va = 'false'
   endif

diff --git a/src/gallium/auxiliary/meson.build b/src/gallium/auxiliary/meson.build
index e76b2ac912eb35f4922160cedb64fb25a1095a6f..668f6c09e01ea90e53ad2f8efe3a66fc7e0f9258 100644 (file)
--- a/src/gallium/auxiliary/meson.build
+++ b/src/gallium/auxiliary/meson.build
@@ -490,7 +490,7 @@ if with_dri2 and with_platform_x11
     files_libgalliumvlwinsys += files('vl/vl_winsys_dri3.c')
   endif
 endif
-if with_platform_drm
+if dep_libdrm.found()
   files_libgalliumvlwinsys += files('vl/vl_winsys_drm.c')
 endif
 

diff --git a/src/gallium/auxiliary/vl/vl_winsys.h b/src/gallium/auxiliary/vl/vl_winsys.h
index 3a35cb6a8596840eab0cd5ccf0b82825d3fccb0a..322de72487a77377a3deaa31f92b501cf4e24f83 100644 (file)
--- a/src/gallium/auxiliary/vl/vl_winsys.h
+++ b/src/gallium/auxiliary/vl/vl_winsys.h
@@ -92,7 +92,7 @@ static inline struct vl_screen *
 vl_dri3_screen_create(void *display, int screen) { return NULL; };
 #endif
 
-#ifdef HAVE_DRM_PLATFORM
+#ifdef HAVE_LIBDRM
 struct vl_screen *
 vl_drm_screen_create(int fd);
 #else