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

kms/surface: Simpify surface feedback creation

Browse source
This commit is contained in:
Victoria Brekenfeld 2025-12-19 19:00:20 +01:00 • committed by Victoria Brekenfeld
parent 85d8b8dc06
commit d17a4ead68
4 changed files with 121 additions and 91 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -852,35 +852,36 @@ impl KmsGuard<'_> {
if !test_only {
if !surface.is_active() {
let mut planes = drm
.device()
.planes(crtc)
.with_context(|| "Failed to enumerate planes")?;
let driver = drm.device().get_driver().ok();
// QUIRK: Using an overlay plane on a nvidia card breaks the display controller (wtf...)
if driver.as_ref().is_some_and(|driver| {
driver
.name()
.to_string_lossy()
.to_lowercase()
.contains("nvidia")
}) {
planes.overlay = vec![];
}
// QUIRK: Cursor planes on evdi sometimes don't disappear correctly.
// TODO: Debug and figure out, as they can be a nice improvement.
if driver.as_ref().is_some_and(|driver| {
driver
.name()
.to_string_lossy()
.to_lowercase()
.contains("evdi")
}) {
planes.cursor = vec![];
}
let compositor: GbmDrmOutput = {
let mut planes = drm
.device()
.planes(crtc)
.with_context(|| "Failed to enumerate planes")?;
let driver = drm.device().get_driver().ok();
// QUIRK: Using an overlay plane on a nvidia card breaks the display controller (wtf...)
if driver.as_ref().is_some_and(|driver| {
driver
.name()
.to_string_lossy()
.to_lowercase()
.contains("nvidia")
}) {
planes.overlay = vec![];
}
// QUIRK: Cursor planes on evdi sometimes don't disappear correctly.
// TODO: Debug and figure out, as they can be a nice improvement.
if driver.as_ref().is_some_and(|driver| {
driver
.name()
.to_string_lossy()
.to_lowercase()
.contains("evdi")
}) {
planes.cursor = vec![];
}
let mut renderer = self
.api
.single_renderer(&device.inner.render_node)
@ -908,7 +909,7 @@ impl KmsGuard<'_> {
*mode,
&[conn],
&surface.output,
Some(planes),
Some(planes.clone()),
&mut renderer,
&elements,
)
@ -943,16 +944,17 @@ impl KmsGuard<'_> {
.unwrap(),
)
.ok();
let primary_formats = compositor_ref.surface().plane_info().formats.clone();
let overlay_formats = planes
.overlay
.iter()
.flat_map(|p| p.formats.iter().cloned())
.collect::<FormatSet>();
surface.resume(
compositor,
compositor_ref.surface().plane_info().formats.clone(),
compositor_ref
.surface()
.planes()
.overlay
.iter()
.flat_map(|p| p.formats.iter().cloned())
.collect::<FormatSet>(),
primary_formats,
Some(overlay_formats).filter(|f| !f.indexset().is_empty()),
);
surface.output.set_adaptive_sync_support(vrr_support);