From 1cfc413c9a4cdd26222197ab0a518c2b603d82b1 Mon Sep 17 00:00:00 2001 From: Danylo Piliaiev Date: Mon, 5 Dec 2022 17:58:05 +0100 Subject: [PATCH] meson: Do not enable drm for KGSL Turnip build Android may use either DRM or some downstream solution, KGSL is a downstream kernel driver for Adreno. Don't enable DRM when we want Turnip to use KGSL instead of DRM. Fixes: 09ac29cca9bf7978911f81bcfce12ce71c260a97 ("meson: Enable system_has_kms_drm for android") Signed-off-by: Danylo Piliaiev Reviewed-by: Emma Anholt Part-of: --- meson.build | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/meson.build b/meson.build index 1e6ccd8..45d04da 100644 --- a/meson.build +++ b/meson.build @@ -176,6 +176,11 @@ with_shared_glapi = with_shared_glapi and with_any_opengl system_has_kms_drm = ['openbsd', 'netbsd', 'freebsd', 'gnu/kfreebsd', 'dragonfly', 'linux', 'sunos', 'android'].contains(host_machine.system()) +with_freedreno_kgsl = get_option('freedreno-kgsl') +if with_freedreno_kgsl + system_has_kms_drm = false +endif + dri_drivers = get_option('dri-drivers') if dri_drivers.length() != 0 error('Mesa\'s main branch no longer has any "classic" drivers, use the "amber" branch instead.') @@ -283,7 +288,6 @@ with_freedreno_vk = _vulkan_drivers.contains('freedreno') with_panfrost_vk = _vulkan_drivers.contains('panfrost') with_swrast_vk = _vulkan_drivers.contains('swrast') with_virtio_vk = _vulkan_drivers.contains('virtio-experimental') -with_freedreno_kgsl = get_option('freedreno-kgsl') with_freedreno_virtio = get_option('freedreno-virtio') with_broadcom_vk = _vulkan_drivers.contains('broadcom') with_imagination_vk = _vulkan_drivers.contains('imagination-experimental') -- 2.7.4