ExternalVendorCode/genode
1
0
Fork 0
mirror of https://github.com/genodelabs/genode.git synced 2024-12-18 21:27:56 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

intel/display: reconstruct merge capture session

Browse Source 
also when the name in the config changes.

Issue #5356
Issue #5345
This commit is contained in:
Alexander Boettcher 2024-10-28 20:59:24 +01:00 committed by Christian Helmuth
parent 44c23ca472
commit f3b94a3b21
1 changed files with 27 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
repos/pc/src/driver/framebuffer/intel/pc/main.cc
View File

@ -60,6 +60,7 @@ struct Framebuffer::Driver
bool new_config_rom { false }; bool new_config_rom { false };
bool disable_all { false }; bool disable_all { false };
bool disable_report_once { false }; bool disable_report_once { false };
bool merge_label_changed { false };
Capture::Connection::Label merge_label { "mirror" }; Capture::Connection::Label merge_label { "mirror" };
@ -120,15 +121,19 @@ struct Framebuffer::Driver
return dirty; return dirty;
} }
bool update(Connector &conn, addr_t const base, bool update(Connector &conn,
Capture::Area &size, Capture::Area &size_phys, addr_t const base,
Capture::Area const mm, Capture::Area const &size,
auto const &label) Capture::Area const &size_phys,
Capture::Area const &mm,
auto const &label,
bool const force_change)
{ {
bool same = (base == conn.base) && bool same = (base == conn.base) &&
(size == conn.size) && (size == conn.size) &&
(size_phys == conn.size_phys) && (size_phys == conn.size_phys) &&
(mm == conn.size_mm); (mm == conn.size_mm) &&
!force_change;
if (same) if (same)
return same; return same;
@ -275,8 +280,12 @@ void Framebuffer::Driver::config_update()
return; return;
config.xml().with_optional_sub_node("merge", [&](auto const &node) { config.xml().with_optional_sub_node("merge", [&](auto const &node) {
auto const merge_label_before = merge_label;
if (node.has_attribute("name")) if (node.has_attribute("name"))
merge_label = node.attribute_value("name", String<160>(merge_label)); merge_label = node.attribute_value("name", String<160>(merge_label));
merge_label_changed = merge_label_before != merge_label;
}); });
if (config.xml().attribute_value("system", false)) { if (config.xml().attribute_value("system", false)) {
@ -467,17 +476,22 @@ void lx_emul_i915_framebuffer_ready(unsigned const connector_id,
drv.ids.apply<Connector>(id, [&](Connector &conn) { drv.ids.apply<Connector>(id, [&](Connector &conn) {
Capture::Area area (xres, yres); Capture::Area const area (xres, yres);
Capture::Area area_phys(phys_width, phys_height); Capture::Area const area_phys(phys_width, phys_height);
auto label = !conn_name bool const merge = Capture::Connection::Label(conn_name) == "mirror_capture";
auto const label = !conn_name
? Capture::Connection::Label(conn.id_element) ? Capture::Connection::Label(conn.id_element)
: Capture::Connection::Label(conn_name) == "mirror_capture" : merge ? drv.merge_label
? drv.merge_label
: Capture::Connection::Label(conn_name); : Capture::Connection::Label(conn_name);
bool const same = drv.update(conn, Genode::addr_t(base), area, bool const same = drv.update(conn, Genode::addr_t(base), area,
area_phys, { mm_width, mm_height}, label); area_phys, { mm_width, mm_height}, label,
merge && drv.merge_label_changed);
if (merge)
drv.merge_label_changed = false;
if (same) { if (same) {
lx_emul_i915_wakeup(unsigned(id.value)); lx_emul_i915_wakeup(unsigned(id.value));