Skip to content

Commit a623fef

Browse files
committed
gpu: Only enable VIRGL if the user specified it in the capsets
Signed-off-by: Matej Hrica <[email protected]>
1 parent 18d2738 commit a623fef

File tree

1 file changed

+6
-5
lines changed

1 file changed

+6
-5
lines changed

vhost-device-gpu/src/backend/virgl.rs

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -4,16 +4,16 @@
44
//
55
// SPDX-License-Identifier: Apache-2.0 or BSD-3-Clause
66

7+
use bitflags::Flags;
8+
use libc::c_void;
9+
use log::{debug, error, trace, warn};
10+
use rutabaga_gfx::RutabagaFence;
711
use std::{
812
collections::BTreeMap,
913
io::IoSliceMut,
1014
os::fd::{AsFd, FromRawFd, IntoRawFd, RawFd},
1115
sync::{Arc, Mutex},
1216
};
13-
14-
use libc::c_void;
15-
use log::{debug, error, trace, warn};
16-
use rutabaga_gfx::RutabagaFence;
1717
use vhost::vhost_user::{
1818
gpu_message::{
1919
VhostUserGpuCursorPos, VhostUserGpuDMABUFScanout, VhostUserGpuDMABUFScanout2,
@@ -155,9 +155,10 @@ impl VirglRendererAdapter {
155155
) -> Self {
156156
let capsets = config.capsets();
157157
let venus_enabled = capsets.contains(GpuCapset::VENUS);
158+
let virgl_enabled = !(capsets & (GpuCapset::VIRGL | GpuCapset::VIRGL2)).is_empty();
158159

159160
let virglrenderer_flags = VirglRendererFlags::new()
160-
.use_virgl(true)
161+
.use_virgl(virgl_enabled)
161162
.use_venus(venus_enabled)
162163
.use_render_server(venus_enabled)
163164
.use_egl(config.flags().use_egl)

0 commit comments

Comments
 (0)