WIP Fix for DPMS not working properly

Cargo.toml

@@ -147,4 +147,5 @@ cosmic-protocols = { git = "https://github.com/pop-os//cosmic-protocols", branch
 cosmic-client-toolkit = { git = "https://github.com/pop-os//cosmic-protocols", branch = "main" }
 
 [patch.crates-io]
-smithay = { git = "https://github.com/smithay/smithay.git", rev = "8148d67" }
+# smithay = { git = "https://github.com/smithay/smithay.git", rev = "8148d67" }
+smithay = { git = "https://github.com/ids1024/smithay", branch = "dpms" }

src/backend/kms/device.rs

@@ -655,29 +655,39 @@ impl LockedDevice<'_> {
                 .surfaces
                 .iter()
                 .filter(|(_, s)| s.is_active())
-                .map(|(crtc, surface)| (*crtc, surface.output.clone()))
+                .map(|(crtc, surface)| (*crtc, (surface.output.clone(), surface.get_dpms())))
                 .collect::<HashMap<_, _>>();
 
             for (crtc, compositor) in self.drm.compositors().iter() {
-                let elements = match output_map.get(crtc) {
-                    Some(output) => output_elements(
-                        Some(&self.inner.render_node),
-                        renderer,
-                        shell,
-                        now,
-                        output,
-                        CursorMode::All,
-                        None,
-                    )
-                    .with_context(|| "Failed to render outputs")?,
-                    None => Vec::new(),
+                let (elements, dpms) = match output_map.get(crtc) {
+                    Some((output, dpms)) => (
+                        output_elements(
+                            Some(&self.inner.render_node),
+                            renderer,
+                            shell,
+                            now,
+                            output,
+                            CursorMode::All,
+                            None,
+                        )
+                        .with_context(|| "Failed to render outputs")?,
+                        *dpms,
+                    ),
+                    None => (Vec::new(), true),
                 };
 
-                let mut compositor = compositor.lock().unwrap();
-                compositor.render_frame(renderer, &elements, CLEAR_COLOR, FrameFlags::empty())?;
-                if let Err(err) = compositor.commit_frame() {
-                    if !matches!(err, FrameError::EmptyFrame) {
-                        return Err(err.into());
+                if dpms {
+                    let mut compositor = compositor.lock().unwrap();
+                    compositor.render_frame(
+                        renderer,
+                        &elements,
+                        CLEAR_COLOR,
+                        FrameFlags::empty(),
+                    )?;
+                    if let Err(err) = compositor.commit_frame() {
+                        if !matches!(err, FrameError::EmptyFrame) {
+                            return Err(err.into());
+                        }
                     }
                 }
             }

src/backend/kms/surface/mod.rs

@@ -448,7 +448,7 @@ impl Surface {
             .send(ThreadCommand::Resume { compositor });
     }
 
-    pub fn get_dpms(&mut self) -> bool {
+    pub fn get_dpms(&self) -> bool {
         self.dpms
     }