Skip to content

drm/apple: don't latch ->crashed on a poweroff swap timeout #582

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
haripako wants to merge 1 commit into
base: asahi
Choose a base branch
from
+18 −1
Open

drm/apple: don't latch ->crashed on a poweroff swap timeout #582

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
19 changes: 18 additions & 1 deletion drivers/gpu/drm/apple/iomfb_template.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -930,7 +930,24 @@ void DCP_FW_NAME(iomfb_poweroff)(struct apple_dcp *dcp)
swap_id = cookie->swap_id;
kref_put(&cookie->refcount, release_swap_cookie);
if (ret <= 0) {
dcp->crashed = true;
/*
* The DCP did not acknowledge the poweroff clear swap.
*
* Do not latch ->crashed here: dcp_crtc_atomic_check() bails
* out on that flag, so every subsequent atomic commit for this
* device is rejected with -EINVAL, permanently. Nothing ever
* clears it, so the display stays dark until reboot.
*
* This is not a crash. The DCP keeps working afterwards: it
* renegotiates the link, publishes its mode list and asserts
* HPD. ->crashed belongs to dcp_rtk_crashed(), the RTKit crash
* callback, which also logs.
*
* Warn instead, so the timeout is at least visible.
*/
dev_warn(dcp->dev,
"%s: timed out waiting for the poweroff clear swap; continuing\n",
__func__);
return;
}

Expand Down