Skip to content

Commit d63d810

Browse files
Wayne LinLyude
authored andcommitted
drm/dp_mst: Fix all mstb marked as not probed after suspend/resume
[Why] After supend/resume, with topology unchanged, observe that link_address_sent of all mstb are marked as false even the topology probing is done without any error. It is caused by wrongly also include "ret == 0" case as a probing failure case. [How] Remove inappropriate checking conditions. Cc: Lyude Paul <[email protected]> Cc: Harry Wentland <[email protected]> Cc: Jani Nikula <[email protected]> Cc: Imre Deak <[email protected]> Cc: Daniel Vetter <[email protected]> Cc: [email protected] Fixes: 37dfdc5 ("drm/dp_mst: Cleanup drm_dp_send_link_address() a bit") Signed-off-by: Wayne Lin <[email protected]> Reviewed-by: Lyude Paul <[email protected]> Signed-off-by: Lyude Paul <[email protected]> Link: https://patchwork.freedesktop.org/patch/msgid/[email protected]
1 parent 80f4e62 commit d63d810

File tree

1 file changed

+2
-2
lines changed

1 file changed

+2
-2
lines changed

drivers/gpu/drm/display/drm_dp_mst_topology.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2929,7 +2929,7 @@ static int drm_dp_send_link_address(struct drm_dp_mst_topology_mgr *mgr,
29292929

29302930
/* FIXME: Actually do some real error handling here */
29312931
ret = drm_dp_mst_wait_tx_reply(mstb, txmsg);
2932-
if (ret <= 0) {
2932+
if (ret < 0) {
29332933
drm_err(mgr->dev, "Sending link address failed with %d\n", ret);
29342934
goto out;
29352935
}
@@ -2981,7 +2981,7 @@ static int drm_dp_send_link_address(struct drm_dp_mst_topology_mgr *mgr,
29812981
mutex_unlock(&mgr->lock);
29822982

29832983
out:
2984-
if (ret <= 0)
2984+
if (ret < 0)
29852985
mstb->link_address_sent = false;
29862986
kfree(txmsg);
29872987
return ret < 0 ? ret : changed;

0 commit comments

Comments
 (0)