From bdba48b64bdad5188b4defc1dc86984ed6f4cd6a Mon Sep 17 00:00:00 2001 From: David Stevens Date: Wed, 27 Jul 2022 15:52:42 +0900 Subject: [PATCH] wl: disable wl shared memory feature When the shared memory feature is enabled, there is a bug in how the driver handles vfds without an associated pfn. Disable the feature bit until the bug is fixed. BUG=b:213532601 TEST=crostini.CopyPaste.wayland_to_x11_buster_stable Change-Id: Ic5f68e167e8ee8f4c990d0c4d73149e60b3ce908 Reviewed-on: https://chromium-review.googlesource.com/c/crosvm/crosvm/+/3789166 Commit-Queue: David Stevens Reviewed-by: Keiichi Watanabe Tested-by: David Stevens --- devices/src/virtio/wl.rs | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/devices/src/virtio/wl.rs b/devices/src/virtio/wl.rs index c6e54d27db..617541bf6f 100644 --- a/devices/src/virtio/wl.rs +++ b/devices/src/virtio/wl.rs @@ -1972,10 +1972,9 @@ impl VirtioDevice for Wl { } fn features(&self) -> u64 { - self.base_features - | 1 << VIRTIO_WL_F_TRANS_FLAGS - | 1 << VIRTIO_WL_F_SEND_FENCES - | 1 << VIRTIO_WL_F_USE_SHMEM + self.base_features | 1 << VIRTIO_WL_F_TRANS_FLAGS | 1 << VIRTIO_WL_F_SEND_FENCES + // TODO(stevensd): re-add flag once driver is fixed + // | 1 << VIRTIO_WL_F_USE_SHMEM } fn ack_features(&mut self, value: u64) {