vasilito/RedBear-OS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'virtio-sdl-fix' into 'main'

Browse Source 
virtio-gpud: Don't crash on no edid descriptor

See merge request redox-os/base!118
This commit is contained in:
Jeremy Soller
2026-02-08 07:37:40 -07:00
parent e79dd0a59b 36e2fbd537
commit f08f60dc51
1 changed files with 15 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
drivers/graphics/virtio-gpud/src/scheme.rs
+15 -10
View File
@@ -309,16 +309,21 @@ impl<'a> GraphicsAdapter for VirtGpuAdapter<'a> {
if self.has_edid {
let edid = edid::parse(&display.edid).unwrap().1;
let first_detailed_timing = edid
.descriptors
.iter()
.find_map(|descriptor| match descriptor {
edid::Descriptor::DetailedTiming(detailed_timing) => Some(detailed_timing),
_ => None,
})
.unwrap();
connector.mm_width = first_detailed_timing.horizontal_size.into();
connector.mm_height = first_detailed_timing.vertical_size.into();
if let Some(first_detailed_timing) =
edid.descriptors
.iter()
.find_map(|descriptor| match descriptor {
edid::Descriptor::DetailedTiming(detailed_timing) => {
Some(detailed_timing)
}
_ => None,
})
{
connector.mm_width = first_detailed_timing.horizontal_size.into();
connector.mm_height = first_detailed_timing.vertical_size.into();
} else {
log::error!("No edid timing descriptor detected");
}
connector.modes = edid
.descriptors