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

kms/deps: Fix nvidia 545 beta

Browse source
This commit is contained in:
Victoria Brekenfeld 2023-10-23 17:51:56 +02:00
parent 8561ab672b
commit ba44289844
3 changed files with 9 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

4
Cargo.lock generated
View file

@ -3885,7 +3885,7 @@ checksum = "942b4a808e05215192e39f4ab80813e599068285906cc91aa64f923db842bd5a"
[[package]] [[package]]
name = "smithay" name = "smithay"
version = "0.3.0" version = "0.3.0"
source = "git+https://github.com/smithay//smithay?rev=988c94d7e#988c94d7e9db357350b3c43f7f727d5b4b523aa9" source = "git+https://github.com/smithay//smithay?rev=dfa75ea#dfa75eaa3d8e9865f8e5cebd04258b8f51cad1cb"
dependencies = [ dependencies = [
"appendlist", "appendlist",
"ash", "ash",
@ -4117,7 +4117,7 @@ dependencies = [
[[package]] [[package]]
name = "taffy" name = "taffy"
version = "0.3.11" version = "0.3.11"
source = "git+https://github.com/DioxusLabs/taffy#daa07e0f4e3e009f5b0c11ada5df9785efd4b2c2" source = "git+https://github.com/DioxusLabs/taffy#d4374b93f0ec2c0ace42d3feafec22d3af1940d8"
dependencies = [ dependencies = [
"arrayvec", "arrayvec",
"grid", "grid",

2
Cargo.toml
View file

@ -88,7 +88,7 @@ debug = true
lto = "fat" lto = "fat"
[patch."https://github.com/Smithay/smithay.git"] [patch."https://github.com/Smithay/smithay.git"]
smithay = { git = "https://github.com/smithay//smithay", rev = "988c94d7e" } smithay = { git = "https://github.com/smithay//smithay", rev = "dfa75ea" }
[patch.crates-io] [patch.crates-io]
calloop = { git = "https://github.com/Smithay/calloop", rev = "71b6e633b1" } calloop = { git = "https://github.com/Smithay/calloop", rev = "71b6e633b1" }

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

@ -26,7 +26,7 @@ use smithay::{
Allocator, Format, Fourcc, Allocator, Format, Fourcc,
}, },
drm::{ drm::{
compositor::{BlitFrameResultError, DrmCompositor, FrameError}, compositor::{BlitFrameResultError, DrmCompositor, FrameError, PrimaryPlaneElement},
DrmDevice, DrmDeviceFd, DrmEvent, DrmEventTime, DrmNode, NodeType, DrmDevice, DrmDeviceFd, DrmEvent, DrmEventTime, DrmNode, NodeType,
}, },
egl::{EGLContext, EGLDevice, EGLDisplay}, egl::{EGLContext, EGLDevice, EGLDisplay},
@ -1254,6 +1254,11 @@ impl Surface {
None None
}; };
if frame_result.needs_sync() {
if let PrimaryPlaneElement::Swapchain(elem) = &frame_result.primary_element {
elem.sync.wait();
}
}
match compositor.queue_frame(feedback) { match compositor.queue_frame(feedback) {
Ok(()) | Err(FrameError::EmptyFrame) => {} Ok(()) | Err(FrameError::EmptyFrame) => {}
Err(err) => { Err(err) => {