diff --git a/.pick_status.json b/.pick_status.json
index ae45f59e01a..61f83dce0cc 100644
--- a/.pick_status.json
+++ b/.pick_status.json
@@ -3844,7 +3844,7 @@
         "description": "meson: fix vdrm inclusion logic",
         "nominated": true,
         "nomination_type": 1,
-        "resolution": 0,
+        "resolution": 1,
         "main_sha": null,
         "because_sha": null,
         "notes": null
diff --git a/meson.build b/meson.build
index 58194e73b1f..d5dbe95075c 100644
--- a/meson.build
+++ b/meson.build
@@ -287,6 +287,13 @@ if freedreno_kmds.length() != 0 and freedreno_kmds != [ 'msm' ] and with_freedre
   endif
 endif
 
+with_vdrm = [
+  with_amdgpu_virtio,
+  freedreno_kmds.contains('virtio'),
+  with_gallium_asahi,
+  with_asahi_vk,
+].contains(true)
+
 with_dri = false
 if with_gallium and system_has_kms_drm
   _glx = get_option('glx')
diff --git a/src/meson.build b/src/meson.build
index 0acf1640f10..61d7d1d40fa 100644
--- a/src/meson.build
+++ b/src/meson.build
@@ -69,7 +69,7 @@ endif
 if with_any_intel
   subdir('intel')
 endif
-if system_has_kms_drm or with_gallium_virgl or with_virtio_vk
+if with_vdrm or with_gallium_virgl or with_virtio_vk
   subdir('virtio')
 endif
 if with_gallium_radeonsi or with_amd_vk or with_gallium_r300 or with_gallium_r600