kms: Also try other nodes for dmabuf import
This commit is contained in:
parent
ef3486f7e0
commit
3d3864b357
1 changed files with 46 additions and 30 deletions
|
|
@ -1584,13 +1584,17 @@ impl KmsState {
|
||||||
global: &DmabufGlobal,
|
global: &DmabufGlobal,
|
||||||
dmabuf: Dmabuf,
|
dmabuf: Dmabuf,
|
||||||
) -> Result<DrmNode> {
|
) -> Result<DrmNode> {
|
||||||
for device in self.devices.values_mut() {
|
let (expected_node, other_nodes) =
|
||||||
if device
|
self.devices.values_mut().partition::<Vec<_>, _>(|device| {
|
||||||
|
device
|
||||||
.socket
|
.socket
|
||||||
.as_ref()
|
.as_ref()
|
||||||
.map(|s| &s.dmabuf_global == global)
|
.map(|s| &s.dmabuf_global == global)
|
||||||
.unwrap_or(false)
|
.unwrap_or(false)
|
||||||
{
|
});
|
||||||
|
|
||||||
|
let mut last_err = anyhow::anyhow!("Dmabuf cannot be imported on any gpu");
|
||||||
|
for device in expected_node.into_iter().chain(other_nodes.into_iter()) {
|
||||||
if device.render_node != self.primary_node {
|
if device.render_node != self.primary_node {
|
||||||
if !device.in_use(&self.primary_node) {
|
if !device.in_use(&self.primary_node) {
|
||||||
self.api
|
self.api
|
||||||
|
|
@ -1609,15 +1613,27 @@ impl KmsState {
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
return self
|
let result = self
|
||||||
.api
|
.api
|
||||||
.single_renderer(&device.render_node)?
|
.single_renderer(&device.render_node)?
|
||||||
.import_dmabuf(&dmabuf, None)
|
.import_dmabuf(&dmabuf, None)
|
||||||
.map(|_| device.render_node)
|
.map(|_| device.render_node)
|
||||||
.map_err(Into::into);
|
.map_err(Into::into);
|
||||||
|
|
||||||
|
match result {
|
||||||
|
Ok(node) => return Ok(node),
|
||||||
|
Err(err) => {
|
||||||
|
trace!(?err, "Failed to import dmabuf on {:?}", device.render_node);
|
||||||
|
last_err = err;
|
||||||
|
|
||||||
|
if !device.in_use(&self.primary_node) {
|
||||||
|
self.api.as_mut().remove_node(&device.render_node);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
unreachable!()
|
};
|
||||||
|
}
|
||||||
|
|
||||||
|
Err(last_err)
|
||||||
}
|
}
|
||||||
|
|
||||||
pub fn schedule_render(
|
pub fn schedule_render(
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue