Merge "drm/msm/dp: check for invalid seqno before clearing a txmsg slot" (6e224259) · Commits · e / devices / android_kernel_fairphone_FP4

drivers/gpu/drm/drm_dp_mst_topology.c

+5 −3

Original line number	Diff line number	Diff line
		@@ -823,8 +823,9 @@ static int drm_dp_mst_wait_tx_reply(struct drm_dp_mst_branch *mstb,
		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,6 +1639,7 @@ static void process_single_up_tx_qlock(struct drm_dp_mst_topology_mgr *mgr,
		if (ret != 1)
		DRM_DEBUG_KMS("failed to send msg in q %d\n", ret);

		if (txmsg->seqno != -1)
		txmsg->dst->tx_slots[txmsg->seqno] = NULL;
		}