From 03b7f5ebdb5728858dd649da24bf8c017b0409d0 Mon Sep 17 00:00:00 2001 From: Kieran Graham Date: Wed, 14 Oct 2026 23:14:54 +0100 Subject: [PATCH 2/6] drm/apple: allow USB4 displays to use bounded link recovery Retain local recovery RFC 2 while keeping the parent session-generation checks and paired-tile reconnect. DPMS off remains respected. Ported from release 56 onto omacom/linux-aurora 6f6367775. Assisted-by: Codex:gpt-6.1-sol --- drivers/gpu/drm/apple/dcp.c | 3 +-- drivers/gpu/drm/apple/iomfb.c | 2 +- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/drivers/gpu/drm/apple/dcp.c b/drivers/gpu/drm/apple/dcp.c index 87352ac70..48bf44d56 100644 --- a/drivers/gpu/drm/apple/dcp.c +++ b/drivers/gpu/drm/apple/dcp.c @@ -1025,8 +1025,7 @@ static void dcp_typec_reconnect_work(struct work_struct *work) dcp->typec_reconnect_tries = 0; return; } - if (++dcp->typec_reconnect_tries < - (dcp_uses_t6020_tunnel_flow(dcp) ? 1 : DPTX_RECONNECT_RETRIES)) { + if (++dcp->typec_reconnect_tries < DPTX_RECONNECT_RETRIES) { mod_delayed_work(system_freezable_wq, &dcp->typec_reconnect_wq, DPTX_RECONNECT_DELAY); return; diff --git a/drivers/gpu/drm/apple/iomfb.c b/drivers/gpu/drm/apple/iomfb.c index 6554db359..c54e8dce4 100644 --- a/drivers/gpu/drm/apple/iomfb.c +++ b/drivers/gpu/drm/apple/iomfb.c @@ -363,7 +363,7 @@ void dcp_hotplug(struct work_struct *work) */ if (!notify_only && connector->base.state && !READ_ONCE(dcp->mode_state.valid) && connector->connected && - !(dcp_uses_t6020_tunnel_flow(dcp))) { + !READ_ONCE(dcp->typec_crtc_off)) { drm_connector_set_link_status_property(&connector->base, DRM_MODE_LINK_STATUS_BAD); -- 2.56.0