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

kms/device: Don't re-enumerate disabled outputs

Browse source
This commit is contained in:
Victoria Brekenfeld 2025-08-11 16:48:16 +02:00 • committed by Victoria Brekenfeld
parent 1db1d8149b
commit 6897f81984
1 changed files with 7 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

9
src/backend/kms/device.rs
View file

@ -586,8 +586,10 @@ impl Device {
.iter() .iter()
.filter(|(conn, maybe)| match (surfaces.get(&conn), maybe) { .filter(|(conn, maybe)| match (surfaces.get(&conn), maybe) {
(Some(current_crtc), Some(new_crtc)) => current_crtc != new_crtc, (Some(current_crtc), Some(new_crtc)) => current_crtc != new_crtc,
(None, _) => true, // see `removed`
_ => false, (Some(_), None) => true,
// if we already know about it, we don't consider it added
(None, _) => self.inner.outputs.get(conn).is_none(),
}) })
.map(|(conn, crtc)| (*conn, *crtc)) .map(|(conn, crtc)| (*conn, *crtc))
.collect::<Vec<_>>(); .collect::<Vec<_>>();
@ -598,6 +600,9 @@ impl Device {
.iter() .iter()
.filter(|(conn, _)| match config.get(conn) { .filter(|(conn, _)| match config.get(conn) {
Some(Some(c)) => surfaces.get(&conn).is_some_and(|crtc| c != crtc), Some(Some(c)) => surfaces.get(&conn).is_some_and(|crtc| c != crtc),
// if don't have a crtc, we need to drop the surface if it exists.
// so it needs to be in both `removed` AND `added`.
Some(None) => surfaces.get(&conn).is_some(),
_ => true, _ => true,
}) })
.map(|(conn, _)| *conn) .map(|(conn, _)| *conn)