From 4aa9e59800f4ed5c868964169fa14413945acb27 Mon Sep 17 00:00:00 2001 From: Bartosz Nitka Date: Tue, 17 Nov 2026 20:18:49 +0100 Subject: [PATCH] tools/asahi: backlight-coldboot: stub the retained-external checks Commit 9649e5974600 ("drm/apple: support retained J613 native26 external displays") made dcp_poweron() flush ext26_blank_work for a native26 external and test dcp_is_retained_external(), so the harness, which compiles dcp_poweron() from the driver, stopped building and both backlight-coldboot runs fail on integration/aurora. Give its apple_dcp the ext26 flag and ext26_blank_work, and stub dcp_is_ext26(), dcp_is_retained_external() and flush_work(), the same stubs #2124 carries in its integration merge. Assisted-by: LLM --- tools/asahi/backlight-coldboot-tests.py | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/tools/asahi/backlight-coldboot-tests.py b/tools/asahi/backlight-coldboot-tests.py index e08f7f3ce9cd3..75b72b186389b 100644 --- a/tools/asahi/backlight-coldboot-tests.py +++ b/tools/asahi/backlight-coldboot-tests.py @@ -71,12 +71,12 @@ def function(source, name): struct desktop *desktop; struct { struct dcp_backlight_state state; int lock; } backlight; struct { bool update; u32 maximum; } brightness; - bool panel,m4,v14,external,typec,pipe_enabled_h17p,crashed,quiescing; + bool panel,m4,v14,external,ext26,typec,pipe_enabled_h17p,crashed,quiescing; bool typec_crtc_off,typec_cable_connected,typec_follow_start,typec_poweron_hpd,hdmi_yielded; unsigned crtc_unplugs,typec_unplugs,typec_generation,typec_reconnect_tries,external_generation,external_crtc_generation; int external_lock,hpd_mutex,relink_lock,relink,typec_iomfb_hpd_ready; struct delayed_work typec_reconnect_wq,placeholder_edid_wq,external_stop_retry_wq,bl_fallback_wq; - struct work_struct external_stop_work; + struct work_struct external_stop_work,ext26_blank_work; void *dev,*hdmi_hpd,*avep; }; struct platform_device { struct apple_dcp *data; }; @@ -95,6 +95,9 @@ def function(source, name): static bool iomfb_v14_7_panel_nits(struct apple_dcp *p) { return p->v14; } static bool dcp_has_panel(struct apple_dcp *p) { return p->panel; } static bool dcp_is_external_h17p(struct apple_dcp *p) { return p->external; } +static bool dcp_is_ext26(struct apple_dcp *p) { return p->ext26; } +static bool dcp_is_retained_external(struct apple_dcp *p) { return p->external || p->ext26; } +static void flush_work(struct work_struct *p) { (void)p; } static bool dcp_is_typec_output(struct apple_dcp *p) { return p->typec; } static bool dcp_h17g_panel(struct apple_dcp *p) { return p->hw.iomfb_method_profile==DCP_IOMFB_METHODS_H17G; } static void dcp_backlight_kick(struct apple_dcp *p) { assert(p->backlight.state.ready);kicks++; }