From 9515b05c086c55b9e3fbddbc56fb6eb3e9a510a8 Mon Sep 17 00:00:00 2001 From: Keiichi Watanabe Date: Mon, 10 Feb 2020 17:06:34 +0900 Subject: devices: virtio: resource_bridge: Transfer plane metadata Transfer plane offsets and strides for exported GPU resource over resource bridge as well as a resource itself. These metadata will be required by virtio-video decoder and encoder. BUG=b:120456557 TEST=Start ARCVM on atlas Change-Id: Iaf539857c0f8525bd5be294521e75ad32cae05e7 Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/crosvm/+/1787032 Reviewed-by: Keiichi Watanabe Reviewed-by: David Stevens Reviewed-by: Chirantan Ekbote Commit-Queue: Keiichi Watanabe Tested-by: Keiichi Watanabe --- devices/src/virtio/wl.rs | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'devices/src/virtio/wl.rs') diff --git a/devices/src/virtio/wl.rs b/devices/src/virtio/wl.rs index 5ace29c..65ad1cf 100644 --- a/devices/src/virtio/wl.rs +++ b/devices/src/virtio/wl.rs @@ -1093,10 +1093,10 @@ impl WlState { #[cfg(feature = "gpu")] VIRTIO_WL_CTRL_VFD_SEND_KIND_VIRTGPU if self.resource_bridge.is_some() => { let sock = self.resource_bridge.as_ref().unwrap(); - match get_resource_fd(sock, id) { - Ok(bridged_file) => { - *fd = bridged_file.as_raw_fd(); - bridged_files.push(bridged_file); + match get_resource_info(sock, id) { + Ok(info) => { + *fd = info.file.as_raw_fd(); + bridged_files.push(info.file); } Err(ResourceBridgeError::InvalidResource(id)) => { warn!("attempt to send non-existent gpu resource {}", id); -- cgit 1.4.1