pxcloud/vhost-device
5
0
Fork 0
mirror of https://github.com/rust-vmm/vhost-device.git synced 2026-01-24 08:22:37 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

gpu/virgl: Make capset handling robust

Browse Source 
Instead of hardcoding the capset indices, lookup the capset index dynamically
based on the configured capsets in the config.

Signed-off-by: Matej Hrica <mhrica@redhat.com>
This commit is contained in:
Matej Hrica 2025-12-09 17:14:57 +01:00
parent 8d7873a699
commit a6a0138661
1 changed files with 13 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
vhost-device-gpu/src/backend/virgl.rs
View File

@ -44,13 +44,9 @@ use crate::{
VirtioGpuResult, VIRTIO_GPU_MAX_SCANOUTS,
},
renderer::Renderer,
GpuConfig,
GpuCapset, GpuConfig,
};
const CAPSET_ID_VIRGL: u32 = 1;
const CAPSET_ID_VIRGL2: u32 = 2;
const CAPSET_ID_VENUS: u32 = 4;
#[derive(Clone)]
pub struct GpuResource {
pub virgl_resource: VirglResource,
@ -134,6 +130,7 @@ impl FenceHandler for VirglFenceHandler {
pub struct VirglRendererAdapter {
renderer: VirglRenderer,
capsets: GpuCapset,
gpu_backend: GpuBackend,
fence_state: Arc<Mutex<FenceState>>,
resources: BTreeMap<u32, GpuResource>,
@ -143,6 +140,8 @@ pub struct VirglRendererAdapter {
impl VirglRendererAdapter {
pub fn new(queue_ctl: &VringRwLock, config: &GpuConfig, gpu_backend: GpuBackend) -> Self {
let capsets = config.capsets();
let virglrenderer_flags = VirglRendererFlags::new()
.use_virgl(true)
.use_venus(true)
@ -162,6 +161,7 @@ impl VirglRendererAdapter {
let renderer = VirglRenderer::init(virglrenderer_flags, fence_handler, None)
.expect("Failed to initialize virglrenderer");
Self {
capsets,
renderer,
gpu_backend,
fence_state,
@ -320,13 +320,14 @@ impl Renderer for VirglRendererAdapter {
}
fn get_capset_info(&self, index: u32) -> VirtioGpuResult {
debug!("the capset index is {index}");
let capset_id = match index {
0 => CAPSET_ID_VIRGL,
1 => CAPSET_ID_VIRGL2,
3 => CAPSET_ID_VENUS,
_ => return Err(ErrInvalidParameter),
};
debug!("Looking up capset at index {index}");
let capset_id = self
.capsets
.iter()
.nth(index as usize)
.ok_or(ErrInvalidParameter)?
.bits() as u32;
let (version, size) = self.renderer.get_capset_info(index);
Ok(OkCapsetInfo {
capset_id,