[PATCH] drm/mst: update the link_address_sent before sending the link address

Dave Airlie airlied at gmail.com
Sat Sep 5 00:44:13 PDT 2015


There is a race where the reply could get processed by another
work queue before we've updated the state.

Update the state before sending the msg to close it.

Pointed out by Adam J Richter on

Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=91481
Signed-off-by: Dave Airlie <airlied at redhat.com>
---
 drivers/gpu/drm/drm_dp_mst_topology.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/drivers/gpu/drm/drm_dp_mst_topology.c b/drivers/gpu/drm/drm_dp_mst_topology.c
index e23df5f..18c2a74 100644
--- a/drivers/gpu/drm/drm_dp_mst_topology.c
+++ b/drivers/gpu/drm/drm_dp_mst_topology.c
@@ -1106,8 +1106,8 @@ static void drm_dp_add_port(struct drm_dp_mst_branch *mstb,
 
 		ret = drm_dp_port_setup_pdt(port);
 		if (ret == true) {
-			drm_dp_send_link_address(mstb->mgr, port->mstb);
 			port->mstb->link_address_sent = true;
+			drm_dp_send_link_address(mstb->mgr, port->mstb);
 		}
 	}
 
@@ -1203,8 +1203,8 @@ static void drm_dp_check_and_send_link_address(struct drm_dp_mst_topology_mgr *m
 	struct drm_dp_mst_port *port;
 	struct drm_dp_mst_branch *mstb_child;
 	if (!mstb->link_address_sent) {
-		drm_dp_send_link_address(mgr, mstb);
 		mstb->link_address_sent = true;
+		drm_dp_send_link_address(mgr, mstb);
 	}
 	list_for_each_entry(port, &mstb->ports, next) {
 		if (port->input)
-- 
2.4.3



More information about the dri-devel mailing list