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

kms: Don't depend on EDID being available

Browse source
This commit is contained in:
Victoria Brekenfeld 2022-09-22 18:21:03 +02:00
parent aa4a83b8ac
commit 88c502527e
1 changed files with 9 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -625,7 +625,7 @@ impl Device {
let conn_info = drm.get_connector(conn, false)?; let conn_info = drm.get_connector(conn, false)?;
let vrr = drm_helpers::set_vrr(drm, crtc, conn, true).unwrap_or(false); let vrr = drm_helpers::set_vrr(drm, crtc, conn, true).unwrap_or(false);
let interface = drm_helpers::interface_name(drm, conn)?; 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);
let mode = crtc_info.mode().unwrap_or_else(|| { let mode = crtc_info.mode().unwrap_or_else(|| {
conn_info conn_info
.modes() .modes()
@ -646,8 +646,14 @@ impl Device {
size: (phys_w as i32, phys_h as i32).into(), size: (phys_w as i32, phys_h as i32).into(),
// TODO: We need to read that from the connector properties // TODO: We need to read that from the connector properties
subpixel: Subpixel::Unknown, subpixel: Subpixel::Unknown,
make: edid_info.manufacturer, make: edid_info
model: edid_info.model, .as_ref()
.map(|info| info.manufacturer.clone())
.unwrap_or_else(|_| String::from("Unknown")),
model: edid_info
.as_ref()
.map(|info| info.model.clone())
.unwrap_or_else(|_| String::from("Unknown")),
}, },
None, None,
); );