commit 6e2242593d4a905661b6ea8023f31d1a3a0d95ae
author qctecmdr <qctecmdr@localhost> Thu Dec 12 09:27:16 2019 -0800
committer Gerrit - the friendly Code Review server <code-review@localhost> Thu Dec 12 09:27:16 2019 -0800
tree d1d111bf99343cfa4fa3b89d826e1ccd6c552329
parent 6df48c2fd6ea4e1d66176a6dc7b3459281734916
parent fe47139588bf246482af942f6332326ce7fa9905

Merge "drm/msm/dp: check for invalid seqno before clearing a txmsg slot"

drivers/gpu/drm/drm_dp_mst_topology.c

diff --git a/drivers/gpu/drm/drm_dp_mst_topology.c b/drivers/gpu/drm/drm_dp_mst_topology.c
index 8835b5f..7794ad2 100644
--- a/drivers/gpu/drm/drm_dp_mst_topology.c
+++ b/drivers/gpu/drm/drm_dp_mst_topology.c
@@ -823,8 +823,9 @@
 			list_del(&txmsg->next);
 		}
 
-		if (txmsg->state == DRM_DP_SIDEBAND_TX_START_SEND ||
-		    txmsg->state == DRM_DP_SIDEBAND_TX_SENT) {
+		if ((txmsg->state == DRM_DP_SIDEBAND_TX_START_SEND ||
+			txmsg->state == DRM_DP_SIDEBAND_TX_SENT) &&
+			txmsg->seqno != -1) {
 			mstb->tx_slots[txmsg->seqno] = NULL;
 		}
 	}
@@ -1638,7 +1639,8 @@
 	if (ret != 1)
 		DRM_DEBUG_KMS("failed to send msg in q %d\n", ret);
 
-	txmsg->dst->tx_slots[txmsg->seqno] = NULL;
+	if (txmsg->seqno != -1)
+		txmsg->dst->tx_slots[txmsg->seqno] = NULL;
 }
 
 static void drm_dp_queue_down_tx(struct drm_dp_mst_topology_mgr *mgr,