From 33149b17e2821b50a8c6c6346f3523b371d12a57 Mon Sep 17 00:00:00 2001
From: Victor Brekenfeld <github@drakulix.de>
Date: Sun, 26 Apr 2020 17:25:13 +0200
Subject: [PATCH] atomic: disable connectors on surface drop

---
 src/backend/drm/atomic/session.rs |  2 +-
 src/backend/drm/atomic/surface.rs | 41 ++++++++++++++++++++++++++++++-
 2 files changed, 41 insertions(+), 2 deletions(-)

diff --git a/src/backend/drm/atomic/session.rs b/src/backend/drm/atomic/session.rs
index b58dbe0..ad90e42 100644
--- a/src/backend/drm/atomic/session.rs
+++ b/src/backend/drm/atomic/session.rs
@@ -59,7 +59,7 @@ impl<A: AsRawFd + 'static> SessionObserver for AtomicDrmDeviceObserver<A> {
                 if let Err(err) = surface.clear_plane(surface.planes.cursor) {
                     warn!(
                         self.logger,
-                        "Failed to clear cursor on {:?}: {}", surface.crtc, err
+                        "Failed to clear cursor on {:?}: {}", surface.planes.cursor, err
                     );
                 }
             }
diff --git a/src/backend/drm/atomic/surface.rs b/src/backend/drm/atomic/surface.rs
index cc01e0f..00cfd12 100644
--- a/src/backend/drm/atomic/surface.rs
+++ b/src/backend/drm/atomic/surface.rs
@@ -8,7 +8,7 @@ use std::cell::Cell;
 use std::collections::HashSet;
 use std::os::unix::io::{AsRawFd, RawFd};
 use std::rc::Rc;
-use std::sync::RwLock;
+use std::sync::{RwLock, atomic::Ordering};
 
 use failure::ResultExt as FailureResultExt;
 
@@ -169,6 +169,45 @@ impl<A: AsRawFd + 'static> Drop for AtomicDrmSurfaceInternal<A> {
             let _ = self.destroy_framebuffer(fb);
             let _ = self.destroy_dumb_buffer(db);
         }
+
+        if !self.dev.active.load(Ordering::SeqCst) {
+            // the device is gone or we are on another tty
+            // old state has been restored, we shouldn't touch it.
+            // if we are on another tty the connectors will get disabled
+            // by the device, when switching back
+            return;
+        }
+
+        // other ttys that use no cursor, might not clear it themselves.
+        // This makes sure our cursor won't stay visible.
+        if let Err(err) = self.clear_plane(self.planes.cursor) {
+            warn!(
+                self.logger,
+                "Failed to clear cursor on {:?}: {}", self.planes.cursor, err
+            );
+        }
+
+        // disable connectors again
+        let current = self.state.read().unwrap();
+        let mut req = AtomicModeReq::new();
+        for conn in current.connectors.iter() {
+            let prop = self.dev.prop_mapping.0.get(&conn)
+                .expect("Unknown Handle").get("CRTC_ID")
+                .expect("Unknown property CRTC_ID");
+            req.add_property(*conn, *prop, property::Value::CRTC(None));
+        }
+        let active_prop = self.dev.prop_mapping.1.get(&self.crtc)
+                .expect("Unknown Handle").get("ACTIVE")
+                .expect("Unknown property ACTIVE");
+        let mode_prop = self.dev.prop_mapping.1.get(&self.crtc)
+                .expect("Unknown Handle").get("MODE_ID")
+                .expect("Unknown property MODE_ID");
+
+        req.add_property(self.crtc, *active_prop, property::Value::Boolean(false));
+        req.add_property(self.crtc, *mode_prop, property::Value::Unknown(0));
+        if let Err(err) = self.atomic_commit(&[AtomicCommitFlags::AllowModeset], req) {
+            warn!(self.logger, "Unable to disable connectors: {}", err);
+        }
     }
 }