fixup "sculpt: support blanking system state" (set system="yes" in ma…

…naged/fb_drv) Issue #5180
genodelabs · Apr 23, 2024 · dc17c5f · dc17c5f
1 parent 72adf26
commit dc17c5f
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 4 deletions.
diff --git a/repos/gems/sculpt/fb_drv/default b/repos/gems/sculpt/fb_drv/default
@@ -1,4 +1,4 @@
-<config width="1024" height="768" max_width="3840" max_height="2160" system="yes">
+<config width="1024" height="768" max_width="3840" max_height="2160">
 	<report connectors="yes"/>
 	<!-- <connector name="eDP-1" width="1920" height="1080" enabled="true" brightness="75"/> -->
 	<!-- <connector name="HDMI-A-1" width="1024" height="768" hz="75" enabled="true"/> -->

diff --git a/repos/gems/src/app/sculpt_manager/driver/fb.h b/repos/gems/src/app/sculpt_manager/driver/fb.h
@@ -65,7 +65,7 @@ struct Sculpt::Fb_driver : private Noncopyable
 					gen_named_node(xml, "child", "intel_gpu"); });
 				gen_capture_route(xml);
 				gen_parent_rom_route(xml, "pc_intel_fb_drv");
-				gen_parent_rom_route(xml, "config", "config -> fb_drv");
+				gen_parent_rom_route(xml, "config", "config -> managed/fb_drv");
 				gen_parent_rom_route(xml, "system", "config -> managed/system");
 				gen_parent_rom_route(xml, "intel_opregion", "report -> drivers/intel_opregion");
 				gen_parent_route<Rm_session>(xml);

diff --git a/repos/gems/src/app/sculpt_manager/main.cc b/repos/gems/src/app/sculpt_manager/main.cc
@@ -1558,9 +1558,13 @@ struct Sculpt::Main : Input_event_handler,
 	Managed_config<Main> _fb_drv_config {
 		_env, "config", "fb_drv", *this, &Main::_handle_fb_drv_config };
 
-	void _handle_fb_drv_config(Xml_node const &)
+	void _handle_fb_drv_config(Xml_node const &node)
 	{
-		_fb_drv_config.try_generate_manually_managed();
+		_fb_drv_config.generate([&] (Xml_generator &xml) {
+			xml.attribute("system", "yes");
+			copy_attributes(xml, node);
+			node.for_each_sub_node([&] (Xml_node const &sub_node) {
+				copy_node(xml, sub_node, { 5 }); }); });
 	}
 
 	void _update_window_layout(Xml_node const &, Xml_node const &);
@@ -1645,6 +1649,7 @@ struct Sculpt::Main : Input_event_handler,
 		_gui.input()->sigh(_input_handler);
 		_gui.mode_sigh(_gui_mode_handler);
 		_handle_gui_mode();
+		_fb_drv_config.trigger_update();
 
 		/*
 		 * Generate initial configurations