leyoda/cosmic-comp
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge pull request #83 from pop-os/qxl_jammy

Browse source 
kms: Use primary node if no render node is found
This commit is contained in:
Victoria Brekenfeld 2023-03-06 12:50:32 +01:00 • committed by GitHub
commit 094bd0df38
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 9 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

12
src/backend/kms/mod.rs
View file

@ -157,10 +157,11 @@ pub fn init_backend(
{ {
path path
} else { } else {
primary_gpu(session.seat()) let primary_node = primary_gpu(session.seat())
.ok() .ok()
.flatten() .flatten()
.and_then(|x| DrmNode::from_path(x).ok()) .and_then(|x| DrmNode::from_path(x).ok());
primary_node
.and_then(|x| x.node_with_type(NodeType::Render).and_then(Result::ok)) .and_then(|x| x.node_with_type(NodeType::Render).and_then(Result::ok))
.unwrap_or_else(|| { .unwrap_or_else(|| {
for dev in all_gpus(session.seat()).expect("No GPU found") { for dev in all_gpus(session.seat()).expect("No GPU found") {
@ -171,7 +172,12 @@ pub fn init_backend(
return node; return node;
} }
} }
panic!("Failed to initialize any GPU"); // If we find no render nodes, use primary node
if let Some(primary_node) = primary_node {
return primary_node;
} else {
panic!("Failed to initialize any GPU");
}
}) })
}; };
info!("Using {} as primary gpu for rendering.", primary); info!("Using {} as primary gpu for rendering.", primary);