mirrors/crosvm
1
0
Fork 0
mirror of https://chromium.googlesource.com/crosvm/crosvm synced 2025-02-05 18:20:34 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

gpu: Remove unused parameter

Browse source 
BUG=b:179755651
TEST=cargo test

Change-Id: Ifc5e2619cec690ccfc8a5f03dee441fabb3d2be8
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/crosvm/+/2987593
Auto-Submit: Chirantan Ekbote <chirantan@chromium.org>
Tested-by: kokoro <noreply+kokoro@google.com>
Commit-Queue: Chirantan Ekbote <chirantan@chromium.org>
Reviewed-by: Keiichi Watanabe <keiichiw@chromium.org>
This commit is contained in:
Chirantan Ekbote 2021-06-25 18:29:23 +09:00 committed by Commit Bot
parent 84b0978847
commit 47fdc8e5a0
2 changed files with 2 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
devices/src/virtio/gpu/mod.rs
View file

@ -20,8 +20,8 @@ use std::thread;
use std::time::Duration; use std::time::Duration;
use base::{ use base::{
debug, error, warn, AsRawDescriptor, AsRawDescriptors, Event, ExternalMapping, PollToken, debug, error, warn, AsRawDescriptor, Event, ExternalMapping, PollToken, RawDescriptor, Tube,
RawDescriptor, Tube, WaitContext, WaitContext,
}; };
use data_model::*; use data_model::*;
@ -969,7 +969,6 @@ pub struct Gpu {
external_blob: bool, external_blob: bool,
rutabaga_component: RutabagaComponentType, rutabaga_component: RutabagaComponentType,
base_features: u64, base_features: u64,
mem: GuestMemory,
udmabuf: bool, udmabuf: bool,
} }
@ -985,7 +984,6 @@ impl Gpu {
external_blob: bool, external_blob: bool,
base_features: u64, base_features: u64,
channels: BTreeMap<String, PathBuf>, channels: BTreeMap<String, PathBuf>,
mem: GuestMemory,
) -> Gpu { ) -> Gpu {
let virglrenderer_flags = VirglRendererFlags::new() let virglrenderer_flags = VirglRendererFlags::new()
.use_egl(gpu_parameters.renderer_use_egl) .use_egl(gpu_parameters.renderer_use_egl)
@ -1055,7 +1053,6 @@ impl Gpu {
external_blob, external_blob,
rutabaga_component: component, rutabaga_component: component,
base_features, base_features,
mem,
udmabuf: gpu_parameters.udmabuf, udmabuf: gpu_parameters.udmabuf,
} }
} }
@ -1122,10 +1119,6 @@ impl VirtioDevice for Gpu {
keep_rds.push(libc::STDERR_FILENO); keep_rds.push(libc::STDERR_FILENO);
} }
if self.udmabuf {
keep_rds.append(&mut self.mem.as_raw_descriptors());
}
if let Some(ref gpu_device_tube) = self.gpu_device_tube { if let Some(ref gpu_device_tube) = self.gpu_device_tube {
keep_rds.push(gpu_device_tube.as_raw_descriptor()); keep_rds.push(gpu_device_tube.as_raw_descriptor());
} }

3
src/linux.rs
View file

@ -642,7 +642,6 @@ fn create_gpu_device(
x_display: Option<String>, x_display: Option<String>,
event_devices: Vec<EventDevice>, event_devices: Vec<EventDevice>,
map_request: Arc<Mutex<Option<ExternalMapping>>>, map_request: Arc<Mutex<Option<ExternalMapping>>>,
mem: &GuestMemory,
) -> DeviceResult { ) -> DeviceResult {
let mut display_backends = vec![ let mut display_backends = vec![
virtio::DisplayBackend::X(x_display), virtio::DisplayBackend::X(x_display),
@ -674,7 +673,6 @@ fn create_gpu_device(
cfg.sandbox, cfg.sandbox,
virtio::base_features(cfg.protected_vm), virtio::base_features(cfg.protected_vm),
cfg.wayland_socket_paths.clone(), cfg.wayland_socket_paths.clone(),
mem.clone(),
); );
let jail = match simple_jail(&cfg, "gpu_device")? { let jail = match simple_jail(&cfg, "gpu_device")? {
@ -1396,7 +1394,6 @@ fn create_virtio_devices(
cfg.x_display.clone(), cfg.x_display.clone(),
event_devices, event_devices,
map_request, map_request,
vm.get_memory(),
)?); )?);
} }
} }