kossLAN/wry
1
0
Fork 0
forked from wry/wry
Code Pull requests Activity

metal: improve logging

Browse source
This commit is contained in:
Julian Orth 2025-09-13 12:57:07 +02:00
parent e5de85299b
commit 3a11e1bd19
2 changed files with 24 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

4
src/backends/metal/monitor.rs
View file

@ -232,6 +232,10 @@ impl MetalBackend {
Some(d) if d.id == id => d, Some(d) if d.id == id => d,
_ => return, _ => return,
}; };
log::info!(
"Received logind response for drm device {}",
dev.devnode.to_bytes().as_bstr(),
);
let res = match res { let res = match res {
Ok(r) => r, Ok(r) => r,
Err(e) => { Err(e) => {

22
src/backends/metal/video.rs
View file

@ -1083,6 +1083,11 @@ fn create_connector(
dev: &Rc<MetalDrmDevice>, dev: &Rc<MetalDrmDevice>,
) -> Result<(Rc<MetalConnector>, ConnectorFutures), DrmError> { ) -> Result<(Rc<MetalConnector>, ConnectorFutures), DrmError> {
let display = create_connector_display_data(connector, dev)?; let display = create_connector_display_data(connector, dev)?;
log::info!(
"Creating connector {} for device {}",
display.connector_id,
dev.devnode.as_bytes().as_bstr(),
);
let slf = Rc::new(MetalConnector { let slf = Rc::new(MetalConnector {
id: connector, id: connector,
kernel_id: Cell::new(display.connector_id), kernel_id: Cell::new(display.connector_id),
@ -1799,6 +1804,11 @@ impl MetalBackend {
for c in removed_connectors { for c in removed_connectors {
dev.futures.remove(&c); dev.futures.remove(&c);
if let Some(c) = dev.connectors.remove(&c) { if let Some(c) = dev.connectors.remove(&c) {
log::info!(
"Removing connector {} from device {}",
c.kernel_id.get(),
dev.dev.devnode.as_bytes().as_bstr(),
);
if let Some(lease_id) = c.lease.get() if let Some(lease_id) = c.lease.get()
&& let Some(lease) = dev.dev.leases.remove(&lease_id) && let Some(lease) = dev.dev.leases.remove(&lease_id)
&& !lease.try_revoke() && !lease.try_revoke()
@ -2467,7 +2477,11 @@ impl MetalBackend {
fn re_init_drm_device(&self, dev: &Rc<MetalDrmDeviceData>) { fn re_init_drm_device(&self, dev: &Rc<MetalDrmDeviceData>) {
if let Err(e) = self.init_drm_device(dev) { if let Err(e) = self.init_drm_device(dev) {
log::error!("Could not initialize device: {}", ErrorFmt(e)); log::error!(
"Could not initialize drm device {}: {}",
dev.dev.devnode.as_bytes().as_bstr(),
ErrorFmt(e),
);
} }
for connector in dev.connectors.lock().values() { for connector in dev.connectors.lock().values() {
if connector.connected() { if connector.connected() {
@ -2552,7 +2566,11 @@ impl MetalBackend {
Ok(_) => break, Ok(_) => break,
Err(e) => e, Err(e) => e,
}; };
log::error!("Could not initialize DRM device: {}", ErrorFmt(&err)); log::error!(
"Could not initialize DRM device {}: {}",
dev.dev.devnode.as_bytes().as_bstr(),
ErrorFmt(&err),
);
let Some(q) = quirks.pop() else { let Some(q) = quirks.pop() else {
return Err(err); return Err(err);
}; };