Epsilon_02/niri
1
0
Fork 0
mirror of https://github.com/YaLTeR/niri.git synced 2025-10-06 00:23:14 +02:00
Code Issues Packages Projects Releases Wiki Activity

tty: Close DRM device session fd in device_removed()

Browse Source 
Same logic as in cosmic-comp.
This commit is contained in:
Shaun Ren
2025-09-17 12:32:26 -04:00
committed by Ivan Molodetskikh
parent e5b0662f48
commit b7f1e382a2
1 changed files with 18 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
src/backend/tty.rs
View File

@@ -3,7 +3,7 @@ use std::collections::{HashMap, HashSet};
use std::fmt::Write; use std::fmt::Write;
use std::iter::zip; use std::iter::zip;
use std::num::NonZeroU64; use std::num::NonZeroU64;
use std::os::fd::AsFd; use std::os::fd::{AsFd, OwnedFd};
use std::path::Path; use std::path::Path;
use std::rc::Rc; use std::rc::Rc;
use std::sync::{Arc, Mutex}; use std::sync::{Arc, Mutex};
@@ -756,6 +756,7 @@ impl Tty {
} }
let mut device = self.devices.remove(&node).unwrap(); let mut device = self.devices.remove(&node).unwrap();
let device_fd = device.drm.device_fd().device_fd();
if let Some(lease_state) = &mut device.drm_lease_state { if let Some(lease_state) = &mut device.drm_lease_state {
lease_state.disable_global::<State>(); lease_state.disable_global::<State>();
@@ -798,9 +799,25 @@ impl Tty {
} }
self.gpu_manager.as_mut().remove_node(&device.render_node); self.gpu_manager.as_mut().remove_node(&device.render_node);
// Trigger re-enumeration in order to remove the device from gpu_manager.
let _ = self.gpu_manager.devices();
niri.event_loop.remove(device.token); niri.event_loop.remove(device.token);
self.refresh_ipc_outputs(niri); self.refresh_ipc_outputs(niri);
drop(device);
match TryInto::<OwnedFd>::try_into(device_fd) {
Ok(fd) => {
if let Err(err) = self.session.close(fd) {
warn!("error closing DRM device fd: {err:?}");
}
}
Err(_) => {
error!("unable to close DRM device cleanly: fd has unexpected references");
}
}
} }
fn connector_connected( fn connector_connected(