From 7fca026b489228db1a1d1fbc3dfb3957b79b1c8b Mon Sep 17 00:00:00 2001 From: Christian Prochaska Date: Thu, 11 Apr 2024 18:35:09 +0200 Subject: [PATCH] sculpt_manager: check devices ROM before fb driver start Issue #5174 --- repos/gems/src/app/sculpt_manager/drivers.cc | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/repos/gems/src/app/sculpt_manager/drivers.cc b/repos/gems/src/app/sculpt_manager/drivers.cc index d8bfd808ba..0a568159ae 100644 --- a/repos/gems/src/app/sculpt_manager/drivers.cc +++ b/repos/gems/src/app/sculpt_manager/drivers.cc @@ -62,8 +62,15 @@ class Sculpt::Drivers::Instance : Noncopyable, { _board_info.detected = Board_info::Detected::from_xml(devices, _platform.xml()); + /* + * The decision which fb driver to start depends on information + * about available devices from both the devices ROM and the + * platform info ROM, so we skip the update if the devices ROM + * is not ready yet. + */ + if (!devices.has_type("empty")) + _fb_driver.update(_children, _board_info, _platform.xml()); - _fb_driver .update(_children, _board_info, _platform.xml()); _ps2_driver .update(_children, _board_info); _touch_driver.update(_children, _board_info); _ahci_driver .update(_children, _board_info);