Add support for edid

Signed-off-by: Matej Hrica <[email protected]>

Author: mtjhrc

src/devices/src/virtio/gpu/device.rs

@@ -27,6 +27,7 @@ pub(crate) const CUR_INDEX: usize = 1;
 // Supported features.
 pub(crate) const AVAIL_FEATURES: u64 = (1u64 << uapi::VIRTIO_F_VERSION_1)
     | (1u64 << uapi::VIRTIO_GPU_F_VIRGL)
+    | (1u64 << uapi::VIRTIO_GPU_F_EDID)
     | (1u64 << uapi::VIRTIO_GPU_F_RESOURCE_UUID)
     | (1u64 << uapi::VIRTIO_GPU_F_RESOURCE_BLOB)
     | (1u64 << uapi::VIRTIO_GPU_F_CONTEXT_INIT);

src/devices/src/virtio/gpu/display.rs

@@ -1,3 +1,4 @@
+use super::edid::EdidInfo;
 use krun_display::{
     DisplayBackendBasicFramebuffer, DisplayBackendError, DisplayBackendNew, Rect, ResourceFormat,
 };
@@ -7,18 +8,72 @@ use virtio_bindings::virtio_gpu::VIRTIO_GPU_MAX_SCANOUTS;
 pub struct DisplayInfo {
     pub width: u32,
     pub height: u32,
+    pub edid: DisplayInfoEdid,
 }
 
-pub const MAX_DISPLAYS: usize = VIRTIO_GPU_MAX_SCANOUTS as usize;
+impl DisplayInfo {
+    pub fn edid_bytes(&self) -> Box<[u8]> {
+        match &self.edid {
+            DisplayInfoEdid::Provided(edid_bytes) => edid_bytes.clone(),
+            DisplayInfoEdid::Generated(edid_params) => {
+                let edid_info = EdidInfo::new(self.width, self.height, edid_params);
+                edid_info.bytes()
+            }
+        }
+    }
+}
 
-pub type DisplayInfoList = [Option<DisplayInfo>; MAX_DISPLAYS];
+#[derive(Debug, Clone)]
+pub enum DisplayInfoEdid {
+    Generated(EdidParams),
+    Provided(Box<[u8]>),
+}
+
+impl DisplayInfoEdid {
+    pub fn generated_params_mut_or_default(&mut self) -> &mut EdidParams {
+        match self {
+            Self::Provided(_) => {
+                *self = DisplayInfoEdid::Generated(EdidParams::default());
+                self.generated_params_mut_or_default()
+            }
+            Self::Generated(ref mut params) => params,
+        }
+    }
+}
+
+#[derive(Debug, Clone, Copy)]
+pub struct EdidParams {
+    pub refresh_rate: u32,
+    pub physical_size: PhysicalSize,
+}
+
+impl Default for EdidParams {
+    fn default() -> Self {
+        EdidParams {
+            refresh_rate: 60,
+            physical_size: PhysicalSize::Dpi(300),
+        }
+    }
+}
+
+#[derive(Debug, Copy, Clone)]
+pub enum PhysicalSize {
+    Dpi(u32),
+    DimensionsMillimeters(u16, u16),
+}
 
 impl DisplayInfo {
     pub fn new(width: u32, height: u32) -> Self {
-        DisplayInfo { width, height }
+        Self {
+            width,
+            height,
+            edid: DisplayInfoEdid::Generated(EdidParams::default()),
+        }
     }
 }
 
+pub const MAX_DISPLAYS: usize = VIRTIO_GPU_MAX_SCANOUTS as usize;
+
 pub struct NoopDisplayBackend;
 
 impl DisplayBackendNew<()> for NoopDisplayBackend {