leyoda/cosmic-comp
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

deps: Switch from edid-rs to libdisplay-info

Browse source
This commit is contained in:
Victoria Brekenfeld 2025-01-02 20:19:04 +01:00 • committed by Victoria Brekenfeld
parent 546966bf15
commit adcb81bbe0
4 changed files with 153 additions and 166 deletions
Download patch file Download diff file Expand all files Collapse all files

12
src/backend/kms/device.rs
View file

@ -677,7 +677,9 @@ fn create_output_for_conn(drm: &mut DrmDevice, conn: connector::Handle) -> Resul
.get_connector(conn, false)
.with_context(|| "Failed to query connector info")?;
let interface = drm_helpers::interface_name(drm, conn)?;
let edid_info = drm_helpers::edid_info(drm, conn);
let edid_info = drm_helpers::edid_info(drm, conn)
.inspect_err(|err| warn!(?err, "failed to get EDID for {}", interface))
.ok();
let (phys_w, phys_h) = conn_info.size().unwrap_or((0, 0));
Ok(Output::new(
@ -694,12 +696,12 @@ fn create_output_for_conn(drm: &mut DrmDevice, conn: connector::Handle) -> Resul
},
make: edid_info
.as_ref()
.map(|info| info.manufacturer.clone())
.unwrap_or_else(|_| String::from("Unknown")),
.and_then(|info| info.make())
.unwrap_or_else(|| String::from("Unknown")),
model: edid_info
.as_ref()
.map(|info| info.model.clone())
.unwrap_or_else(|_| String::from("Unknown")),
.and_then(|info| info.model())
.unwrap_or_else(|| String::from("Unknown")),
},
))
}