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

devices: gpu: conditionally enable capsets if context_mask is specified

Browse source 
This allows finer grain selection of context types, and eventually deletion
of preprocessor flags and "default component type".

BUG=b:173630595
TEST=compile

Change-Id: I5669911dfd4d6a7fd290e73ed3939d54fabdb89f
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/crosvm/+/3655287
Reviewed-by: Rob Clark <robdclark@chromium.org>
Tested-by: kokoro <noreply+kokoro@google.com>
Reviewed-by: Daniel Verkamp <dverkamp@chromium.org>
This commit is contained in:
Gurchetan Singh 2022-05-19 10:32:02 -07:00 committed by Chromeos LUCI
parent 567c777f15
commit d18f0bac4d
1 changed files with 23 additions and 19 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -1021,7 +1021,7 @@ pub struct Gpu {
base_features: u64,
udmabuf: bool,
render_server_fd: Option<SafeDescriptor>,
_context_mask: u64,
context_mask: u64,
}
impl Gpu {
@ -1099,7 +1099,7 @@ impl Gpu {
base_features,
udmabuf: gpu_parameters.udmabuf,
render_server_fd,
_context_mask: gpu_parameters.context_mask,
context_mask: gpu_parameters.context_mask,
}
}
@ -1147,26 +1147,30 @@ impl Gpu {
events_read |= VIRTIO_GPU_EVENT_DISPLAY;
}
let num_capsets = match self.rutabaga_component {
RutabagaComponentType::Rutabaga2D => 0,
_ => {
#[allow(unused_mut)]
let mut num_capsets = 0;
let num_capsets = match self.context_mask {
0 => {
match self.rutabaga_component {
RutabagaComponentType::Rutabaga2D => 0,
_ => {
let mut num_capsets = 0;
// Three capsets for virgl_renderer
#[cfg(feature = "virgl_renderer")]
{
num_capsets += 3;
// Three capsets for virgl_renderer
#[cfg(feature = "virgl_renderer")]
{
num_capsets += 3;
}
// One capset for gfxstream
#[cfg(feature = "gfxstream")]
{
num_capsets += 1;
}
num_capsets
}
}
// One capset for gfxstream
#[cfg(feature = "gfxstream")]
{
num_capsets += 1;
}
num_capsets
}
_ => self.context_mask.count_ones(),
};
virtio_gpu_config {