From cb6d98cb3b78f7e9ad6cdc123eada2369a18632f Mon Sep 17 00:00:00 2001 From: Ryan Neph Date: Wed, 17 Jul 2024 13:39:37 -0700 Subject: [PATCH] rutabaga_gfx: cross_domain: fix bug in channel reporting wayland_service cannot startup without this fix because crosvm incorrectly only reports the last supported channel (CROSS_DOMAIN_CHANNEL_TYPE_CAMERA = 0x4) instead of all (CROSS_DOMAIN_CHANNEL_TYPE_WAYLAND | CROSS_DOMAIN_CHANNEL_TYPE_CAMERA = 0x6). BUG=b:322173539 TEST=ARCVM reports caps.supported_channels = 0x6 instead of 0x4 Change-Id: I84928176beecc051d407017d204fbe0936e1dc26 Reviewed-on: https://chromium-review.googlesource.com/c/crosvm/crosvm/+/5717781 Commit-Queue: Ryan Neph Reviewed-by: Daniel Verkamp Auto-Submit: Ryan Neph Commit-Queue: Daniel Verkamp --- rutabaga_gfx/src/cross_domain/mod.rs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/rutabaga_gfx/src/cross_domain/mod.rs b/rutabaga_gfx/src/cross_domain/mod.rs index f1f016fca9..366bea9dc5 100644 --- a/rutabaga_gfx/src/cross_domain/mod.rs +++ b/rutabaga_gfx/src/cross_domain/mod.rs @@ -894,7 +894,7 @@ impl RutabagaComponent for CrossDomain { let mut caps: CrossDomainCapabilities = Default::default(); if let Some(ref channels) = self.channels { for channel in channels { - caps.supported_channels = 1 << channel.channel_type; + caps.supported_channels |= 1 << channel.channel_type; } }