Merge pull request #298 from mahkoh/jorth/drm-blocking

metal: unset O_NONBLOCK for DRM file descriptors
mahkoh · Oct 19, 2024 · b7b3227 · b7b3227
2 parents 2a3a924 + 3f00158
commit b7b3227
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 2 deletions.
diff --git a/src/backends/metal/monitor.rs b/src/backends/metal/monitor.rs
@@ -8,7 +8,10 @@ use {
         dbus::{DbusError, TRUE},
         udev::UdevDevice,
         utils::{
-            bitflags::BitflagsExt, cell_ext::CellExt, errorfmt::ErrorFmt, nonblock::set_nonblock,
+            bitflags::BitflagsExt,
+            cell_ext::CellExt,
+            errorfmt::ErrorFmt,
+            nonblock::{set_block, set_nonblock},
         },
         video::drm::DrmMaster,
         wire_dbus::org::freedesktop::login1::session::{
@@ -236,6 +239,12 @@ impl MetalBackend {
                     return;
                 }
             };
+            if let Err(e) = set_block(res.fd.raw()) {
+                log::error!(
+                    "Could not set drm file descriptor to blocking: {}",
+                    ErrorFmt(e),
+                );
+            }
             let master = match DrmMaster::new(&slf.state.ring, res.fd.clone()) {
                 Ok(m) => Rc::new(m),
                 Err(e) => {

diff --git a/src/utils/nonblock.rs b/src/utils/nonblock.rs
@@ -2,6 +2,12 @@ use {crate::utils::oserror::OsError, uapi::c};
 
 pub fn set_nonblock(fd: c::c_int) -> Result<(), OsError> {
     let fl = uapi::fcntl_getfl(fd)?;
-    uapi::fcntl_setfl(fd, fl | c::SOCK_NONBLOCK)?;
+    uapi::fcntl_setfl(fd, fl | c::O_NONBLOCK)?;
+    Ok(())
+}
+
+pub fn set_block(fd: c::c_int) -> Result<(), OsError> {
+    let fl = uapi::fcntl_getfl(fd)?;
+    uapi::fcntl_setfl(fd, fl & !c::O_NONBLOCK)?;
     Ok(())
 }