Skip to content

drm: apple: free a DP tunnel route when its HPD release times out #460

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
coffeejunk wants to merge 1 commit into
base: integration/aurora
Choose a base branch
from
Open

drm: apple: free a DP tunnel route when its HPD release times out #460

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
18 changes: 16 additions & 2 deletions drivers/gpu/drm/apple/dcp-fabric.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2311,11 +2311,25 @@ static int dcp_tb_release_locked(struct apple_dcp_typec_port *port,
return ret;
}
dcp = (*slot)->dcp;
/* A refused display release keeps the route and its binding owned. */
/*
* A refused display release keeps the route and its binding owned.
* A timed-out one frees them: apple_dpin_release_binding() does not
* retry after an unplug.
*/
if (port->hpd || dcp->typec_cable_connected) {
ret = dcp_dptx_disconnect_oob(to_platform_device(dcp->dev), 0);
if (ret)
if (ret == -ETIMEDOUT) {
dev_warn(dcp->dev,
"DP tunnel dpin%u: HPD release timed out, releasing its pipeline anyway\n",
dpin);
ret = dcp_dptx_disconnect(dcp, 0);
if (ret)
dev_warn(dcp->dev,
"DP tunnel dpin%u: DPTX release failed: %d\n",
dpin, ret);
} else if (ret) {
return ret;
}
}
ret = dcp_typec_route_deactivate(*slot);
if (ret) {
Expand Down