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 <ryanneph@google.com>
Reviewed-by: Daniel Verkamp <dverkamp@chromium.org>
Auto-Submit: Ryan Neph <ryanneph@google.com>
Commit-Queue: Daniel Verkamp <dverkamp@chromium.org>
This commit is contained in:
Ryan Neph 2024-07-17 13:39:37 -07:00 committed by crosvm LUCI
parent ee140e87de
commit cb6d98cb3b

View file

@ -894,7 +894,7 @@ impl RutabagaComponent for CrossDomain {
let mut caps: CrossDomainCapabilities = Default::default(); let mut caps: CrossDomainCapabilities = Default::default();
if let Some(ref channels) = self.channels { if let Some(ref channels) = self.channels {
for channel in channels { for channel in channels {
caps.supported_channels = 1 << channel.channel_type; caps.supported_channels |= 1 << channel.channel_type;
} }
} }