From 57362807307d487ea29afb4d7db1f83edcc88707 Mon Sep 17 00:00:00 2001 From: Trigger Huang Date: Wed, 27 Aug 2025 19:09:19 +0800 Subject: [PATCH] virtio/vdrm: add ENABLE_DRM_AMDGPU for c_args ENABLE_DRM_AMDGPU must be defined when amdgpu_virtio is enabled; otherwise, vdrm and amdgpu_virtio will have different definitions of struct virgl_renderer_capset_drm. As a result, on amdgpu_virtio side, the content of struct vdrm_device will be corrupted. Thanks Honglei Huang for pointing out the different definitions of struct virgl_renderer_capset_drm. Cc: mesa-stable Signed-off-by: Trigger Huang Reviewed-by: Pierre-Eric Pelloux-Prayer Part-of: --- src/virtio/vdrm/meson.build | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/src/virtio/vdrm/meson.build b/src/virtio/vdrm/meson.build index e3d4e9d5aba..bd0b97c4113 100644 --- a/src/virtio/vdrm/meson.build +++ b/src/virtio/vdrm/meson.build @@ -3,6 +3,10 @@ inc_virtio_vdrm = include_directories('.') +libvdrm_c_args = [no_override_init_args] +if with_amdgpu_virtio + libvdrm_c_args += ['-DENABLE_DRM_AMDGPU'] +endif libvdrm = static_library( 'libvdrm', [ @@ -17,7 +21,7 @@ libvdrm = static_library( inc_virtio, inc_virtio_gpu, ], - c_args : [ no_override_init_args ], + c_args : libvdrm_c_args, gnu_symbol_visibility: 'hidden', dependencies: [ dep_libdrm,