libdisplay-info integration

anvil/src/udev.rs

@@ -88,8 +88,8 @@ use smithay::{
     },
 };
 use smithay_drm_extras::{
+    display_info,
     drm_scanner::{DrmScanEvent, DrmScanner},
-    edid::EdidInfo,
 };
 use tracing::{debug, error, info, trace, warn};
 
@@ -929,9 +929,17 @@ impl AnvilState<UdevData> {
             })
             .unwrap_or(false);
 
-        let (make, model) = EdidInfo::for_connector(&device.drm, connector.handle())
-            .map(|info| (info.manufacturer, info.model))
-            .unwrap_or_else(|| ("Unknown".into(), "Unknown".into()));
+        let display_info = display_info::for_connector(&device.drm, connector.handle());
+
+        let make = display_info
+            .as_ref()
+            .and_then(|info| info.make())
+            .unwrap_or_else(|| "Unknown".into());
+
+        let model = display_info
+            .as_ref()
+            .and_then(|info| info.model())
+            .unwrap_or_else(|| "Unknown".into());
 
         if non_desktop {
             info!("Connector {} is non-desktop, setting up for leasing", output_name);

smithay-drm-extras/Cargo.toml

@@ -6,15 +6,12 @@ license = "MIT"
 authors = ["Bartłomiej Maryńczak <marynczakbartlomiej@gmail.com>"]
 
 [dependencies]
-edid-rs = "0.1.0"
+libdisplay-info = { version = "0.1.0", optional = true }
 drm = { version = "0.12.0" }
 
 [features]
-default = []
-generate-hwdata = ["pkg-config"]
+default = ["display-info"]
+display-info = ["libdisplay-info"]
 
 [dev-dependencies.smithay]
 path = "../"
-
-[build-dependencies]
-pkg-config = { version = "0.3.26", optional = true }

smithay-drm-extras/README.md

@@ -2,7 +2,7 @@
 
 This crate contains some extra abstractions and helpers over DRM
 
-- `edid` module is responsible for extraction of information from DRM connectors (`model` and `manufacturer`) 
+- `display_info` module is responsible for extraction of information from DRM connectors (`model` and `manufacturer`) 
 - `drm_scanner` module contains helpers for detecting connector connected and disconnected events as well as mapping crtc to them.
   - `ConnectorScanner` is responsible for tracking connected/disconnected events.
   - `CrtcMapper` trait and `SimpleCrtcMapper` are meant for mapping crtc to connector.

smithay-drm-extras/examples/simple.rs

@@ -2,8 +2,8 @@ use std::{collections::HashMap, path::PathBuf, time::Duration};
 
 use ::drm::control::{connector, crtc};
 use smithay_drm_extras::{
+    display_info,
     drm_scanner::{self, DrmScanEvent},
-    edid::EdidInfo,
 };
 
 use smithay::{
@@ -135,9 +135,17 @@ impl State {
         if let Some(device) = self.devices.get_mut(&node) {
             let name = format!("{}-{}", connector.interface().as_str(), connector.interface_id());
 
-            let (manufacturer, model) = EdidInfo::for_connector(&device.drm, connector.handle())
-                .map(|info| (info.manufacturer, info.model))
-                .unwrap_or_else(|| ("Unknown".into(), "Unknown".into()));
+            let display_info = display_info::for_connector(&device.drm, connector.handle());
+
+            let manufacturer = display_info
+                .as_ref()
+                .and_then(|info| info.make())
+                .unwrap_or_else(|| "Unknown".into());
+
+            let model = display_info
+                .as_ref()
+                .and_then(|info| info.model())
+                .unwrap_or_else(|| "Unknown".into());
 
             println!("Connected:");
             dbg!(name);
@@ -166,7 +174,11 @@ impl State {
             return;
         };
 
-        for event in device.drm_scanner.scan_connectors(&device.drm) {
+        for event in device
+            .drm_scanner
+            .scan_connectors(&device.drm)
+            .expect("failed to scan connectors")
+        {
             match event {
                 DrmScanEvent::Connected {
                     connector,

smithay-drm-extras/src/display_info.rs

@@ -0,0 +1,37 @@
+//! # EDID - Extended Display Identification Data
+//!
+//! This module is meant to help with extraction of EDID data from connectors
+//!
+//! ```no_run
+//! # mod helpers { include!("./docs/doctest_helpers.rs"); };
+//! # let drm_device: helpers::FakeDevice = todo!();
+//! # let connector = todo!();
+//! use smithay_drm_extras::display_info;
+//!
+//! let info = display_info::for_connector(&drm_device, connector).unwrap();
+//!
+//! println!("Monitor name: {}", info.model());
+//! println!("Manufacturer name: {}", info.make());
+//! ```
+
+use drm::control::{connector, Device as ControlDevice};
+use libdisplay_info::info::Info;
+
+/// Try to read the [`Info`] from the connector EDID property
+pub fn for_connector(device: &impl ControlDevice, connector: connector::Handle) -> Option<Info> {
+    let props = device.get_properties(connector).ok()?;
+
+    let (info, value) = props
+        .into_iter()
+        .filter_map(|(handle, value)| {
+            let info = device.get_property(handle).ok()?;
+
+            Some((info, value))
+        })
+        .find(|(info, _)| info.name().to_str() == Ok("EDID"))?;
+
+    let blob = info.value_type().convert_value(value).as_blob()?;
+    let data = device.get_property_blob(blob).ok()?;
+
+    Info::parse_edid(&data).ok()
+}