amd/virtio: enable Android amdgpu-virtio build option

Android builds need to pass the Meson amdgpu-virtio option explicitly.
Add BOARD_MESA3D_AMDGPU_VIRTIO handling and forward it to Meson,
defaulting to false when the board flag is not set.

Use the same quoted amdgpu.h include style as the other AMD virtio
headers so the Android build resolves the header through Mesa's
configured include paths.

Signed-off-by: Lei Huang <Lei.Huang@amd.com>
Reviewed-by: Pierre-Eric Pelloux-Prayer <pierre-eric.pelloux-prayer@amd.com>
Reviewed-by: Valentine Burley <valentine.burley@collabora.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/41957>
This commit is contained in:
Lei Huang 2026-06-08 09:06:12 +08:00 committed by Marge Bot
parent 2a0bacd012
commit f29b92a46d
2 changed files with 3 additions and 2 deletions

View file

@ -94,6 +94,7 @@ MESON_GEN_NINJA := \
-Dgbm-backends-path=/vendor/$(MESA3D_LIB_DIR) \
-Degl=$(if $(BOARD_MESA3D_GALLIUM_DRIVERS),enabled,disabled) \
-Dllvm=$(if $(MESON_GEN_LLVM_STUB),enabled,disabled) \
-Damdgpu-virtio=$(if $(filter true,$(BOARD_MESA3D_AMDGPU_VIRTIO)),true,false)\
-Dcpp_rtti=false \
-Dlmsensors=disabled \
-Dandroid-libbacktrace=disabled \

View file

@ -13,7 +13,7 @@
#include <libsync.h>
#include <dlfcn.h>
#include <libdrm/amdgpu.h>
#include "amdgpu.h"
#include "amdgpu_virtio_private.h"
#include "drm-uapi/amdgpu_drm.h"
@ -531,4 +531,4 @@ amdvgpu_va_range_alloc(amdvgpu_device_handle dev,
bool amdvgpu_has_vm_always_valid(amdvgpu_device_handle dev)
{
return dev->vdev->caps.u.amdgpu.has_vm_always_valid;
}
}