Skip to contentSkip to conversation

drm/dp_mst: Don't drop NAKs for down responses

PATCH In review Lyude Paul 2 participants 2 messages Apr 3, 2020 – Apr 6, 2020

Subsystems (2)
lore
Share & tools
lore

Lyude Paul

author
#0 lore raw

PATCH 1/1 drm/dp_mst: Don't drop NAKs for down responses

It looks like that when we introduced the ability to handle multiple down requests at once, we accidentally started dropping NAK replies - causing sideband messages which got NAK'd to seemingly timeout and cause all sorts of weirdness.

So, fix this by making sure we don't return from drm_dp_mst_handle_down_rep() early, but instead treat NAKs like any other message.

Fixes fbc821c4a506 ("drm/mst: Support simultaneous down replies")
Cc Wayne Lin <[email protected]>
Cc Wayne Lin <[email protected]>
Cc Sean Paul <[email protected]>
---
 drivers/gpu/drm/drm_dp_mst_topology.c | 1 -
 1 file changed, 1 deletion(-)
drivers/gpu/drm/drm_dp_mst_topology.c +0 -1
index 10d0315af513..5449ada3e019 100644
@@ -3813,7 +3813,6 @@ static int drm_dp_mst_handle_down_rep(struct drm_dp_mst_topology_mgr *mgr)
 			      txmsg->reply.u.nak.reason,
 			      drm_dp_mst_nak_reason_str(txmsg->reply.u.nak.reason),
 			      txmsg->reply.u.nak.nak_data);
-		goto out_clear_reply;
 	}
 
 	memset(msg, 0, sizeof(struct drm_dp_sideband_msg_rx));
Signature · 1 line
2.25.1
Reviewed-by on v1 1/1
#1 lore raw
Quoted 10 lines · Lyude Paul

It looks like that when we introduced the ability to handle multiple down requests at once, we accidentally started dropping NAK replies - causing sideband messages which got NAK'd to seemingly timeout and cause all sorts of weirdness.

So, fix this by making sure we don't return from drm_dp_mst_handle_down_rep() early, but instead treat NAKs like any other message.

Quoted 5 lines
Fixes fbc821c4a506 ("drm/mst: Support simultaneous down replies")
Cc Wayne Lin <[email protected]>
Cc Wayne Lin <[email protected]>
Cc Sean Paul <[email protected]>

Thank you for fixing this

Quoted 19 lines
---
 drivers/gpu/drm/drm_dp_mst_topology.c | 1 -
 1 file changed, 1 deletion(-)
drivers/gpu/drm/drm_dp_mst_topology.c +0 -2
index 10d0315af513..5449ada3e019 100644
@@ -3813,7 +3813,6 @@ static int drm_dp_mst_handle_down_rep(struct drm_dp_mst_topology_mgr *mgr)
                              txmsg->reply.u.nak.reason,
                              drm_dp_mst_nak_reason_str(txmsg->reply.u.nak.reason),
                              txmsg->reply.u.nak.nak_data);
-               goto out_clear_reply;
        }
 
        memset(msg, 0, sizeof(struct drm_dp_sideband_msg_rx));
--

2.25.1