diff options
| author | Danylo Piliaiev <dpiliaiev@igalia.com> | 2022-12-05 17:58:05 +0100 |
|---|---|---|
| committer | Eric Engestrom <eric@engestrom.ch> | 2022-12-14 20:47:01 +0000 |
| commit | a0ffb41002ec8f547515cbd21e8f0a178f0947d6 (patch) | |
| tree | e9dff3587310cc8dc89188a2bcf908e52e0b2b62 | |
| parent | 2fbea1fdaa7e0b4cc69e6a89aa00bea890c59c68 (diff) | |
| download | mesa-a0ffb41002ec8f547515cbd21e8f0a178f0947d6.tar.gz | |
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 <dpiliaiev@igalia.com>
Reviewed-by: Emma Anholt <emma@anholt.net>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/20168>
(cherry picked from commit 1cfc413c9a4cdd26222197ab0a518c2b603d82b1)
| -rw-r--r-- | .pick_status.json | 2 | ||||
| -rw-r--r-- | meson.build | 6 |
2 files changed, 6 insertions, 2 deletions
diff --git a/.pick_status.json b/.pick_status.json index cfdaa51f59a..5df0db86c88 100644 --- a/.pick_status.json +++ b/.pick_status.json @@ -3028,7 +3028,7 @@ "description": "meson: Do not enable drm for KGSL Turnip build", "nominated": true, "nomination_type": 1, - "resolution": 0, + "resolution": 1, "main_sha": null, "because_sha": "09ac29cca9bf7978911f81bcfce12ce71c260a97" }, diff --git a/meson.build b/meson.build index 5daafad8dce..ba15744859e 100644 --- a/meson.build +++ b/meson.build @@ -175,6 +175,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.') @@ -278,7 +283,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') |