From 7803302be7eeff297f40902a918ee111a8099e86 Mon Sep 17 00:00:00 2001 From: Erik Bourget Date: Fri, 20 Nov 2026 02:29:04 -0500 Subject: [PATCH] drm/apple: publish completion of native display takeover A display controller the bootloader left scanning out a framebuffer can still show that surface after DRM registration. Reserve its retirement record with the cache controller when binding, and mark it retired once an accepted, shown KMS swap replaces or clears slot zero. A paired firmware-27 scanout passes the firmware's shown state to the owner, set when both engines displayed the retired swap. If the record cannot be allocated the display still takes over, without a retirement report, so allocation stays off. Until that displayed completion arrives, pull the primary plane into atomic commits for that CRTC so cursor- or overlay-only commits replay the intended slot-zero surface with its own framebuffer reference, force an explicit slot-zero clear when the primary plane is disabled, and drop any inherited slot-zero reference from the pending scanout to match that clear. Signed-off-by: Erik Bourget --- drivers/gpu/drm/apple/apple_drv.c | 73 ++++++++++++++- drivers/gpu/drm/apple/dcp-internal.h | 2 + drivers/gpu/drm/apple/dcp-peer-frames-v27.h | 17 +++- .../gpu/drm/apple/dcp-peer-runtime-v27.inc | 10 +- drivers/gpu/drm/apple/dcp.c | 14 +++ drivers/gpu/drm/apple/dcp.h | 5 +- drivers/gpu/drm/apple/iomfb.c | 21 +++++ drivers/gpu/drm/apple/iomfb_template.c | 48 ++++++++-- tools/asahi/dcp-peer-shown-tests.py | 91 +++++++++++++++++++ tools/asahi/dcpext26-queue-tests.py | 5 +- tools/asahi/run-host-tests.py | 1 + 11 files changed, 266 insertions(+), 21 deletions(-) create mode 100644 tools/asahi/dcp-peer-shown-tests.py diff --git a/drivers/gpu/drm/apple/apple_drv.c b/drivers/gpu/drm/apple/apple_drv.c index dddbacc0cf41a..d3256d772bbb3 100644 --- a/drivers/gpu/drm/apple/apple_drv.c +++ b/drivers/gpu/drm/apple/apple_drv.c @@ -777,11 +777,82 @@ static int apple_atomic_commit(struct drm_device *dev, return ret; } +static int apple_atomic_check(struct drm_device *dev, + struct drm_atomic_commit *state) +{ + struct drm_plane *plane; + struct drm_plane_state *old_plane_state, *new_plane_state; + struct drm_crtc *crtc; + struct drm_crtc_state *crtc_state; + int i, ret; + + ret = drm_atomic_helper_check_modeset(dev, state); + if (ret) + return ret; + + /* + * Until a displayed KMS swap retires the boot scanout, pull the CRTC + * and its primary plane into every commit touching that CRTC so a + * cursor- or overlay-only commit replays the intended slot-zero state + * and framebuffer reference inside the atomic transaction. + */ + for_each_oldnew_plane_in_state(state, plane, old_plane_state, + new_plane_state, i) { + struct drm_crtc *targets[2] = { + old_plane_state->crtc, + new_plane_state->crtc, + }; + + for (int t = 0; t < ARRAY_SIZE(targets); t++) { + struct drm_crtc *target = targets[t]; + + if (!target || t8132_ext_crtc(target)) + continue; + if (!dcp_boot_surface_pending(to_apple_crtc(target)->dcp)) + continue; + crtc_state = drm_atomic_get_crtc_state(state, target); + if (IS_ERR(crtc_state)) + return PTR_ERR(crtc_state); + } + } + + for_each_new_crtc_in_state(state, crtc, crtc_state, i) { + struct drm_plane_state *plane_state; + + if (t8132_ext_crtc(crtc) || !crtc->primary) + continue; + if (!crtc_state->enable || !crtc_state->active) + continue; + if (!dcp_boot_surface_pending(to_apple_crtc(crtc)->dcp)) + continue; + + plane_state = drm_atomic_get_plane_state(state, crtc->primary); + if (IS_ERR(plane_state)) + return PTR_ERR(plane_state); + crtc_state->planes_changed = true; + } + + if (dev->mode_config.normalize_zpos) { + ret = drm_atomic_normalize_zpos(dev, state); + if (ret) + return ret; + } + + ret = drm_atomic_helper_check_planes(dev, state); + if (ret) + return ret; + + if (state->legacy_cursor_update) + state->async_update = !drm_atomic_helper_async_check(dev, state); + + return 0; +} + static const struct drm_mode_config_funcs apple_mode_config_funcs = { .atomic_state_alloc = apple_atomic_state_alloc, .atomic_state_clear = apple_atomic_state_clear, .atomic_state_free = apple_atomic_state_free, - .atomic_check = drm_atomic_helper_check, + .atomic_check = apple_atomic_check, .atomic_commit = apple_atomic_commit, .fb_create = drm_gem_fb_create, }; diff --git a/drivers/gpu/drm/apple/dcp-internal.h b/drivers/gpu/drm/apple/dcp-internal.h index ea38c3fd64de7..924955a057250 100644 --- a/drivers/gpu/drm/apple/dcp-internal.h +++ b/drivers/gpu/drm/apple/dcp-internal.h @@ -863,6 +863,8 @@ struct apple_dcp { /* clear all surfaces on init */ bool surfaces_cleared; + bool boot_surface_pending; + bool boot_scanout_reserved; /* enable CRC calculation */ bool crc_enabled; diff --git a/drivers/gpu/drm/apple/dcp-peer-frames-v27.h b/drivers/gpu/drm/apple/dcp-peer-frames-v27.h index abb7798a1764f..749aea5499244 100644 --- a/drivers/gpu/drm/apple/dcp-peer-frames-v27.h +++ b/drivers/gpu/drm/apple/dcp-peer-frames-v27.h @@ -8,8 +8,8 @@ * outstanding swaps, as in the existing single-pipe retirement path. */ struct dcp_peer_frames_v27 { - u32 first, submitted, engine[2], retired; - bool active, armed, failed, have[2], have_retired; + u32 first, submitted, engine[2], retired, shown[2]; + bool active, armed, failed, have[2], have_retired, have_shown[2]; }; static inline void dcp_peer_frame_submit_v27(struct dcp_peer_frames_v27 *s, u32 id) @@ -21,9 +21,14 @@ static inline void dcp_peer_frame_submit_v27(struct dcp_peer_frames_v27 *s, u32 s->submitted = id; } +/* + * *shown: both engines' firmware reported the retired swap itself as + * displayed, from completions of that swap ID. + */ static inline bool dcp_peer_frame_complete_v27(struct dcp_peer_frames_v27 *s, unsigned int engine, u32 id, - u32 *watermark) + bool shown_now, u32 *watermark, + bool *shown) { u32 done; @@ -33,6 +38,10 @@ static inline bool dcp_peer_frame_complete_v27(struct dcp_peer_frames_v27 *s, return false; s->engine[engine] = id; s->have[engine] = true; + if (shown_now) { + s->shown[engine] = id; + s->have_shown[engine] = true; + } if (!s->have[0] || !s->have[1]) return false; done = (s32)(s->engine[0] - s->engine[1]) < 0 ? s->engine[0] : s->engine[1]; @@ -40,6 +49,8 @@ static inline bool dcp_peer_frame_complete_v27(struct dcp_peer_frames_v27 *s, return false; s->retired = *watermark = done; s->have_retired = true; + *shown = s->have_shown[0] && s->shown[0] == done && + s->have_shown[1] && s->shown[1] == done; return true; } #endif diff --git a/drivers/gpu/drm/apple/dcp-peer-runtime-v27.inc b/drivers/gpu/drm/apple/dcp-peer-runtime-v27.inc index cd8340105b37b..7094402d5c94f 100644 --- a/drivers/gpu/drm/apple/dcp-peer-runtime-v27.inc +++ b/drivers/gpu/drm/apple/dcp-peer-runtime-v27.inc @@ -325,11 +325,12 @@ void dcp_peer_swap_failed_v27(struct apple_dcp *dcp) dcp_mode_invalidate(&dcp->mode_state); } -bool dcp_peer_swap_complete_v27(struct apple_dcp *dcp, u32 id, ktime_t now, - void (*report)(struct apple_dcp *, u32, ktime_t)) +bool dcp_peer_swap_complete_v27(struct apple_dcp *dcp, u32 id, ktime_t now, bool shown, + void (*report)(struct apple_dcp *, u32, ktime_t, bool)) { struct apple_dcp *owner; u32 watermark; + bool both_shown; /* Independent CRTCs must not serialize through the pair's mutex. */ if (!peer_scanout || (!READ_ONCE(dcp->peer_frames.active) && @@ -339,9 +340,10 @@ bool dcp_peer_swap_complete_v27(struct apple_dcp *dcp, u32 id, ktime_t now, owner = dcp->peer_owner ?: dcp; if (!peer_scanout || !owner->peer_frames.active) return false; - if (dcp_peer_frame_complete_v27(&owner->peer_frames, dcp != owner, id, &watermark)) + if (dcp_peer_frame_complete_v27(&owner->peer_frames, dcp != owner, id, shown, + &watermark, &both_shown)) /* Queue the combined watermark to the primary IOMFB owner. */ - report(owner, watermark, now); + report(owner, watermark, now, both_shown); return true; } diff --git a/drivers/gpu/drm/apple/dcp.c b/drivers/gpu/drm/apple/dcp.c index 8a33895235852..485284e2053fa 100644 --- a/drivers/gpu/drm/apple/dcp.c +++ b/drivers/gpu/drm/apple/dcp.c @@ -23,6 +23,7 @@ #include #include #include +#include #include #include #include @@ -6104,6 +6105,19 @@ static int dcp_firmware_metadata_v27(struct apple_dcp *dcp) dcp->dfb_region_size = resource_size(&resource); if (!dcp->dfb_region_size) return -EINVAL; + /* + * The boot surface is on screen until a displayed swap of ours + * replaces it. Reserve its retirement record before any present. + * Without the record the display still takes over, and a cache + * controller waiting on it keeps allocation off. + */ + ret = apple_mcc_boot_scanout_reserve(dev->of_node); + if (ret == -ENOMEM) + dev_warn(dev, "no boot scanout record: system cache allocation stays off\n"); + else if (ret) + return ret; + dcp->boot_scanout_reserved = !ret; + WRITE_ONCE(dcp->boot_surface_pending, true); clocks: /* diff --git a/drivers/gpu/drm/apple/dcp.h b/drivers/gpu/drm/apple/dcp.h index f1d0f49026d60..66b3102fffd61 100644 --- a/drivers/gpu/drm/apple/dcp.h +++ b/drivers/gpu/drm/apple/dcp.h @@ -82,8 +82,8 @@ int dcp_peer_stop_v27(struct apple_dcp *dcp); struct apple_dcp *dcp_peer_scanout_v27(struct apple_dcp *dcp); void dcp_peer_swap_armed_v27(struct apple_dcp *dcp, u32 id); void dcp_peer_swap_failed_v27(struct apple_dcp *dcp); -bool dcp_peer_swap_complete_v27(struct apple_dcp *dcp, u32 id, ktime_t now, - void (*report)(struct apple_dcp *, u32, ktime_t)); +bool dcp_peer_swap_complete_v27(struct apple_dcp *dcp, u32 id, ktime_t now, bool shown, + void (*report)(struct apple_dcp *, u32, ktime_t, bool)); int dcp_set_crc(struct drm_crtc *crtc, bool enabled); int dcp_crtc_atomic_check(struct drm_crtc *crtc, struct drm_atomic_commit *commit); int dcp_get_connector_type(struct platform_device *pdev); @@ -105,6 +105,7 @@ void dcp_ext26_open_services(struct apple_dcp *dcp); int dcp_ext26_layout_stop(struct apple_dcp *dcp); int dcp_wait_ready(struct platform_device *pdev, u64 timeout); void dcp_flush(struct drm_crtc *crtc, struct drm_atomic_commit *commit); +bool dcp_boot_surface_pending(struct platform_device *pdev); bool dcp_hdr_metadata_live(struct platform_device *pdev); bool dcp_edr_live(struct platform_device *pdev); void dcp_retain_framebuffer(struct platform_device *pdev, diff --git a/drivers/gpu/drm/apple/iomfb.c b/drivers/gpu/drm/apple/iomfb.c index 1f3e97e6c5e9f..fc822729f3cfd 100644 --- a/drivers/gpu/drm/apple/iomfb.c +++ b/drivers/gpu/drm/apple/iomfb.c @@ -3796,6 +3796,20 @@ iomfb_scanout_prepare_h17p(struct apple_dcp *dcp, struct drm_crtc *crtc, drm_framebuffer_get(new_state->fb); } } + if (dcp->boot_surface_pending && scanout->fb[0]) { + struct drm_plane_state *primary = crtc->primary ? + drm_atomic_get_new_plane_state(state, crtc->primary) : NULL; + + /* + * Match the explicit slot-zero clear in iomfb_flush() when the + * primary plane is disabled; dcp->iomfb.scanout keeps its own + * reference pinned until completion replaces it. + */ + if (!primary || primary->crtc != crtc || !primary->visible || !primary->fb) { + drm_framebuffer_put(scanout->fb[0]); + scanout->fb[0] = NULL; + } + } if (dcp_is_ext26(dcp)) { struct iomfb_scanout_h17p *dropped; u64 bytes = ext26_scanout_bytes(scanout); @@ -4401,6 +4415,13 @@ static void iomfb_start(struct apple_dcp *dcp) } } +bool dcp_boot_surface_pending(struct platform_device *pdev) +{ + struct apple_dcp *dcp = pdev ? platform_get_drvdata(pdev) : NULL; + + return dcp && READ_ONCE(dcp->boot_surface_pending); +} + bool dcp_is_initialized(struct platform_device *pdev) { struct apple_dcp *dcp = platform_get_drvdata(pdev); diff --git a/drivers/gpu/drm/apple/iomfb_template.c b/drivers/gpu/drm/apple/iomfb_template.c index 066c7a5f1cfdd..225c89529a38e 100644 --- a/drivers/gpu/drm/apple/iomfb_template.c +++ b/drivers/gpu/drm/apple/iomfb_template.c @@ -19,6 +19,7 @@ #include #include #include +#include #include #include @@ -737,7 +738,7 @@ static u32 dcpep_cb_zero(struct apple_dcp *dcp) return 0; } -static void dcp_report_swap_complete(struct apple_dcp *dcp, u32 id, ktime_t now) +static void dcp_report_swap_complete(struct apple_dcp *dcp, u32 id, ktime_t now, bool shown) { bool retire = true; if (dcp_is_ext26(dcp)) { @@ -790,8 +791,18 @@ static void dcp_report_swap_complete(struct apple_dcp *dcp, u32 id, ktime_t now) dcp->crashed = true; return; } - if (dcp->hw.iomfb_method_profile != DCP_IOMFB_METHODS_H17G) + if (dcp->hw.iomfb_method_profile != DCP_IOMFB_METHODS_H17G) { + /* Only a displayed KMS swap that touched boot slot zero retires it. */ + if (dcp->boot_surface_pending && shown && dcp->iomfb.next_scanout && + !iomfb_present_brightness_only_h17p(dcp) && + (DCP_FW_SWAP(dcp).swap.swap_enabled & BIT(0))) { + WRITE_ONCE(dcp->boot_surface_pending, false); + dev_info(dcp->dev, "boot scanout retired by displayed swap %u\n", id); + if (dcp->boot_scanout_reserved) + apple_mcc_boot_scanout_retired(dcp->dev->of_node); + } retire = iomfb_present_complete_h17p(dcp); + } #endif #if DCP_FW_DESKTOP_26(DCP_FW_VER) /* Late or duplicate completions cannot retire the replacement's flip. */ @@ -825,15 +836,17 @@ static void dcp_report_swap_complete(struct apple_dcp *dcp, u32 id, ktime_t now) } #if (DCP_FW_H17(DCP_FW_VER) && DCP_FW_VER >= DCP_FW_VERSION(27, 0, 0)) -struct dcp_peer_completion { u32 id; ktime_t time; }; +struct dcp_peer_completion { u32 id; ktime_t time; bool shown; }; + static void dcp_peer_report_on_owner(struct apple_dcp *owner, void *data, void *cookie) { struct dcp_peer_completion *completion = data; - dcp_report_swap_complete(owner, completion->id, completion->time); + dcp_report_swap_complete(owner, completion->id, completion->time, completion->shown); } -static void dcp_peer_queue_completion(struct apple_dcp *owner, u32 id, ktime_t time) + +static void dcp_peer_queue_completion(struct apple_dcp *owner, u32 id, ktime_t time, bool shown) { - struct dcp_peer_completion completion = { id, time }; + struct dcp_peer_completion completion = { id, time, shown }; if (iomfb_queue_callback(owner, dcp_peer_report_on_owner, &completion, sizeof(completion), NULL)) { WRITE_ONCE(owner->crashed, true); @@ -848,10 +861,15 @@ static void dcpep_cb_swap_complete(struct apple_dcp *dcp, ktime_t now = dcp_is_ext26(dcp) ? ns_to_ktime(dcp->ext26_rx_ns) : ktime_get(); trace_iomfb_swap_complete(dcp, resp->swap_id); #if (DCP_FW_H17(DCP_FW_VER) && DCP_FW_VER >= DCP_FW_VERSION(27, 0, 0)) - if (dcp_peer_swap_complete_v27(dcp, resp->swap_id, now, dcp_peer_queue_completion)) + if (dcp_peer_swap_complete_v27(dcp, resp->swap_id, now, resp->unkbool, + dcp_peer_queue_completion)) return; #endif - dcp_report_swap_complete(dcp, resp->swap_id, now); +#if DCP_FW_H17(DCP_FW_VER) + dcp_report_swap_complete(dcp, resp->swap_id, now, resp->unkbool); +#else + dcp_report_swap_complete(dcp, resp->swap_id, now, false); +#endif } /* special */ @@ -4540,9 +4558,21 @@ void DCP_FW_NAME(iomfb_flush)(struct apple_dcp *dcp, struct drm_crtc *crtc, stru #endif } +#if DCP_FW_H17(DCP_FW_VER) + /* + * Keep sending an explicit slot-zero update until a displayed KMS + * completion confirms the boot scanout has retired. An enabled primary + * plane is pulled into the atomic commit by apple_atomic_check(); if + * slot zero is still absent here, the primary plane is disabled and + * slot zero should be cleared. + */ + if (dcp->boot_surface_pending && !(req->swap.swap_enabled & BIT(0))) + req->swap.swap_enabled |= BIT(0); +#endif + if (!has_surface && !crtc_state->color_mgmt_changed) { if (crtc_state->enable && crtc_state->active && - !crtc_state->planes_changed) { + !crtc_state->planes_changed && !dcp->boot_surface_pending) { schedule_work(&dcp->vblank_wq); return; } diff --git a/tools/asahi/dcp-peer-shown-tests.py b/tools/asahi/dcp-peer-shown-tests.py new file mode 100644 index 0000000000000..1b26c2d3ab408 --- /dev/null +++ b/tools/asahi/dcp-peer-shown-tests.py @@ -0,0 +1,91 @@ +#!/usr/bin/env python3 +# SPDX-License-Identifier: GPL-2.0-only OR MIT +"""Paired firmware-27 completions carry the retired swap's displayed state to the owner.""" +from pathlib import Path +import subprocess +import sys +import tempfile + +ROOT = Path(__file__).resolve().parents[2] +HEADER = (ROOT / 'drivers/gpu/drm/apple/dcp-peer-frames-v27.h').read_text() +SHOWN = ''' *shown = s->have_shown[0] && s->shown[0] == done && + s->have_shown[1] && s->shown[1] == done; +''' +assert HEADER.count(SHOWN) == 1 +if '--always-shown' in sys.argv: + HEADER = HEADER.replace(SHOWN, '\t*shown = true;\n') +if '--owner-only' in sys.argv: + HEADER = HEADER.replace(SHOWN, '\t*shown = s->have_shown[0] && s->shown[0] == done;\n') + +TEST = r''' +#include +#include +#include +typedef uint32_t u32; typedef int32_t s32; +''' + HEADER.replace('#include ', '') + r''' +static struct dcp_peer_frames_v27 paired(u32 first, u32 last) +{ + struct dcp_peer_frames_v27 s = { .active = true }; + + for (u32 id = first; id <= last; id++) + dcp_peer_frame_submit_v27(&s, id); + return s; +} + +int main(void) +{ + struct dcp_peer_frames_v27 s; + u32 w = 0; + bool shown = true; + + /* First modeset of a pair: both engines display swap 5. */ + s = paired(5, 5); + assert(!dcp_peer_frame_complete_v27(&s, 0, 5, true, &w, &shown)); + assert(dcp_peer_frame_complete_v27(&s, 1, 5, true, &w, &shown)); + assert(w == 5 && shown); + + /* The peer's half of swap 5 was not displayed. */ + s = paired(5, 5); + assert(!dcp_peer_frame_complete_v27(&s, 0, 5, true, &w, &shown)); + assert(dcp_peer_frame_complete_v27(&s, 1, 5, false, &w, &shown)); + assert(w == 5 && !shown); + + /* Neither half displayed (the owner's completion came second). */ + s = paired(5, 5); + assert(!dcp_peer_frame_complete_v27(&s, 1, 5, false, &w, &shown)); + assert(dcp_peer_frame_complete_v27(&s, 0, 5, false, &w, &shown)); + assert(w == 5 && !shown); + + /* + * Engines drift: the peer has shown 6 when the owner shows 5. The + * retired swap is 5, which the peer's shown 6 does not vouch for; + * swap 6 then retires shown. + */ + s = paired(5, 6); + assert(!dcp_peer_frame_complete_v27(&s, 1, 6, true, &w, &shown)); + assert(dcp_peer_frame_complete_v27(&s, 0, 5, true, &w, &shown)); + assert(w == 5 && !shown); + assert(dcp_peer_frame_complete_v27(&s, 0, 6, true, &w, &shown)); + assert(w == 6 && shown); + + /* A displayed earlier swap does not mark a later, undisplayed one. */ + s = paired(5, 6); + assert(!dcp_peer_frame_complete_v27(&s, 0, 5, true, &w, &shown)); + assert(!dcp_peer_frame_complete_v27(&s, 0, 6, false, &w, &shown)); + assert(dcp_peer_frame_complete_v27(&s, 1, 6, true, &w, &shown)); + assert(w == 6 && !shown); + + /* A stale or duplicate completion is not a retirement. */ + assert(!dcp_peer_frame_complete_v27(&s, 1, 6, true, &w, &shown)); + return 0; +} +''' + +with tempfile.TemporaryDirectory() as t: + src = Path(t) / 'peer.c' + src.write_text(TEST) + subprocess.run(['cc', '-std=gnu11', '-Wall', '-Werror', '-fsanitize=address,undefined', + str(src), '-o', str(src.with_suffix(''))], check=True) + if subprocess.run([str(src.with_suffix(''))]).returncode: + sys.exit(1) +print('PASS paired completion shown state: first modeset, undisplayed half, drift, stale shown, duplicate') diff --git a/tools/asahi/dcpext26-queue-tests.py b/tools/asahi/dcpext26-queue-tests.py index 76a4cafd6899b..983a57a65ee25 100644 --- a/tools/asahi/dcpext26-queue-tests.py +++ b/tools/asahi/dcpext26-queue-tests.py @@ -55,11 +55,12 @@ def function(name): struct drm_framebuffer {struct obj *obj[1];int refs;}; static void drm_framebuffer_get(struct drm_framebuffer *f){assert(f->refs>0);f->refs++;} static void drm_framebuffer_put(struct drm_framebuffer *f){assert(f->refs>1);f->refs--;} -struct drm_crtc {int unused;}; struct drm_plane {unsigned iomfb_surf;}; +struct drm_crtc {struct drm_plane *primary;}; #define to_apple_plane(p) (p) struct drm_plane_state {struct drm_crtc *crtc;bool visible;struct drm_framebuffer *fb;}; struct drm_atomic_commit {int refs,count;struct drm_plane plane[4];struct drm_plane_state old[4],new[4];}; +static struct drm_plane_state *drm_atomic_get_new_plane_state(struct drm_atomic_commit *s,struct drm_plane *p){for(int i=0;icount;i++)if(&s->plane[i]==p)return &s->new[i];return NULL;} #define for_each_oldnew_plane_in_state(s,p,o,n,i) for(i=0;i<(s)->count&&((p)=&(s)->plane[i],(o)=&(s)->old[i],(n)=&(s)->new[i],1);i++) static struct drm_atomic_commit *drm_atomic_commit_get(struct drm_atomic_commit *s){s->refs++;return s;} static void drm_atomic_commit_put(struct drm_atomic_commit *s){assert(s->refs>1);s->refs--;} @@ -79,7 +80,7 @@ def function(name): struct {bool pending;} present_state_h17p;struct {bool valid;} mode_state;struct {bool connected;} *connector; struct {void *data;} chunks;bool native,crashed,ext26_control_pending,ext26_blanked,ext26_normal,ext26_early_complete; unsigned ext26_epochs;u64 ext26_retained_bytes;struct list_head ext26_retained; - int fw_compat;struct work_struct vblank_wq,bl_update_wq; + int fw_compat;bool boot_surface_pending;struct work_struct vblank_wq,bl_update_wq; }; static void iomfb_v27_sleep_start(struct apple_dcp *d, struct iomfb_transaction *t) { } #define DCP_FIRMWARE_V_27_0 27 diff --git a/tools/asahi/run-host-tests.py b/tools/asahi/run-host-tests.py index c3cecff8b36dd..b650bca3977b9 100755 --- a/tools/asahi/run-host-tests.py +++ b/tools/asahi/run-host-tests.py @@ -66,6 +66,7 @@ def mutations(flag, names, base, expect=KILL): (['--final-skips-unresolved'], KILL), (['--detach-retired-only'], KILL), (['--resume-after-detach'], KILL)], + 'dcp-peer-shown-tests.py': [([], PASS), (['--always-shown'], KILL), (['--owner-only'], KILL)], 'dcpext26-queue-tests.py': [([], PASS), (['--drop-v27-close'], KILL)], 'dcpext26-retrain-tests.py': [([], PASS), (['--negative-control'], KILL)], 'dcpext26-lifecycle-tests.py': [([], PASS)],