Skip to content

drm/apple: don't treat a slow poweroff clear swap as a DCP crash #635

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
makhov wants to merge 2 commits into
base: fairydust
Choose a base branch
from
+23 −6
Open

drm/apple: don't treat a slow poweroff clear swap as a DCP crash #635

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
4c78e25
drm/apple: don't treat a slow poweroff clear swap as a DCP crash
makhov Sep 21, 2026
1a853aa
drm/apple: stop poweroff early if DCP crashed during the clear swap
makhov Sep 21, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
29 changes: 23 additions & 6 deletions drivers/gpu/drm/apple/iomfb_template.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -926,16 +926,33 @@ void DCP_FW_NAME(iomfb_poweroff)(struct apple_dcp *dcp)

dcp_swap_start(dcp, false, &swap_req, dcp_swap_clear_started, cookie);

ret = wait_for_completion_timeout(&cookie->done, msecs_to_jiffies(50));
/*
* On DP unplug DCP firmware first tears down the link itself (HPD
* removal, M3 power down, set_device_enabled 1 -> 0), which can take
* more than 50 ms. Only processes the clear swap afterwards.
*
* A timeout here is not a crash: firmware crashes are reported via
* dcp_rtk_crashed(), and dcp->crashed permanently rejects every atomic
* check on this CRTC. Warn and power off anyway, like the
* setPowerState(0) wait below does. A late reply is safe, the cookie is
* refcounted.
*/
ret = wait_for_completion_timeout(&cookie->done, msecs_to_jiffies(1000));
swap_id = cookie->swap_id;
kref_put(&cookie->refcount, release_swap_cookie);
if (ret <= 0) {
dcp->crashed = true;
return;
if (ret == 0) {
/* crashed while we waited, RTKit refuses any further messages */
if (dcp->crashed) {
dev_warn(dcp->dev, "%s: DCP crashed during clear swap\n",
__func__);
return;
}
dev_warn(dcp->dev, "%s: clear swap timeout %u ms\n", __func__, 1000);
} else {
dev_dbg(dcp->dev, "%s: clear swap submitted: %u after %u ms\n",
__func__, swap_id, 1000 - jiffies_to_msecs(ret));
}

dev_dbg(dcp->dev, "%s: clear swap submitted: %u\n", __func__, swap_id);

poff_cookie = kzalloc(sizeof(*poff_cookie), GFP_KERNEL);
if (!poff_cookie)
return;
Expand Down