* [PATCH 0/1] Backport "drm/dp_mst: Kill the second sideband tx slot, save the world" for drm-fixes @ 2020-04-27 21:34 ` Lyude Paul 0 siblings, 0 replies; 6+ messages in thread From: Lyude Paul @ 2020-04-27 21:34 UTC (permalink / raw) To: dri-devel; +Cc: Todd Previte, David Airlie, linux-kernel, Dave Airlie Because this patch will likely end up fixing a lot of MST issues we either don't know about, or weren't able to figure out a fix for before, I definitely want to make sure this patch gets cc'd to stable as well. It doesn't apply cleanly to drm-misc-fixes, so here's a backported version that does. Lyude Paul (1): drm/dp_mst: Kill the second sideband tx slot, save the world drivers/gpu/drm/drm_dp_mst_topology.c | 122 +++++++------------------- include/drm/drm_dp_mst_helper.h | 18 +--- 2 files changed, 33 insertions(+), 107 deletions(-) -- 2.25.3 _______________________________________________ dri-devel mailing list dri-devel@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/dri-devel ^ permalink raw reply [flat|nested] 6+ messages in thread
* [PATCH 0/1] Backport "drm/dp_mst: Kill the second sideband tx slot, save the world" for drm-fixes @ 2020-04-27 21:34 ` Lyude Paul 0 siblings, 0 replies; 6+ messages in thread From: Lyude Paul @ 2020-04-27 21:34 UTC (permalink / raw) To: dri-devel Cc: Maxime Ripard, Maarten Lankhorst, Daniel Vetter, Dave Airlie, David Airlie, linux-kernel, Todd Previte Because this patch will likely end up fixing a lot of MST issues we either don't know about, or weren't able to figure out a fix for before, I definitely want to make sure this patch gets cc'd to stable as well. It doesn't apply cleanly to drm-misc-fixes, so here's a backported version that does. Lyude Paul (1): drm/dp_mst: Kill the second sideband tx slot, save the world drivers/gpu/drm/drm_dp_mst_topology.c | 122 +++++++------------------- include/drm/drm_dp_mst_helper.h | 18 +--- 2 files changed, 33 insertions(+), 107 deletions(-) -- 2.25.3 ^ permalink raw reply [flat|nested] 6+ messages in thread
* [PATCH 1/1] drm/dp_mst: Kill the second sideband tx slot, save the world 2020-04-27 21:34 ` Lyude Paul @ 2020-04-27 21:34 ` Lyude Paul -1 siblings, 0 replies; 6+ messages in thread From: Lyude Paul @ 2020-04-27 21:34 UTC (permalink / raw) To: dri-devel Cc: Todd Previte, David Airlie, linux-kernel, stable, Lin, Wayne, Dave Airlie, Sean Paul While we support using both tx slots for sideband transmissions, it appears that DisplayPort devices in the field didn't end up doing a very good job of supporting it. From section 5.2.1 of the DP 2.0 specification: There are MST Sink/Branch devices in the field that do not handle interleaved message transactions. To facilitate message transaction handling by downstream devices, an MST Source device shall generate message transactions in an atomic manner (i.e., the MST Source device shall not concurrently interleave multiple message transactions). Therefore, an MST Source device shall clear the Message_Sequence_No value in the Sideband_MSG_Header to 0. This might come as a bit of a surprise since the vast majority of hubs will support using both tx slots even if they don't support interleaved message transactions, and we've also been using both tx slots since MST was introduced into the kernel. However, there is one device we've had trouble getting working consistently with MST for so long that we actually assumed it was just broken: the infamous Dell P2415Qb. Previously this monitor would appear to work sometimes, but in most situations would end up timing out LINK_ADDRESS messages almost at random until you power cycled the whole display. After reading section 5.2.1 in the DP 2.0 spec, some closer investigation into this infamous display revealed it was only ever timing out on sideband messages in the second TX slot. Sure enough, avoiding the second TX slot has suddenly made this monitor function perfectly for the first time in five years. And since they explicitly mention this in the specification, I doubt this is the only monitor out there with this issue. This might even explain explain the seemingly harmless garbage sideband responses we would occasionally see with MST hubs! So - rewrite our sideband TX handlers to only support one TX slot. In order to simplify our sideband handling now that we don't support transmitting to multiple MSTBs at once, we also move all state tracking for down replies from mstbs to the topology manager. Signed-off-by: Lyude Paul <lyude@redhat.com> Fixes: ad7f8a1f9ced ("drm/helper: add Displayport multi-stream helper (v0.6)") Cc: Sean Paul <sean@poorly.run> Cc: "Lin, Wayne" <Wayne.Lin@amd.com> Cc: <stable@vger.kernel.org> # v3.17+ Reviewed-by: Sean Paul <sean@poorly.run> Link: https://patchwork.freedesktop.org/patch/msgid/20200424181308.770749-1-lyude@redhat.com --- drivers/gpu/drm/drm_dp_mst_topology.c | 122 +++++++------------------- include/drm/drm_dp_mst_helper.h | 18 +--- 2 files changed, 33 insertions(+), 107 deletions(-) diff --git a/drivers/gpu/drm/drm_dp_mst_topology.c b/drivers/gpu/drm/drm_dp_mst_topology.c index 9d89ebf3a749..ed6faaf4bbf3 100644 --- a/drivers/gpu/drm/drm_dp_mst_topology.c +++ b/drivers/gpu/drm/drm_dp_mst_topology.c @@ -1203,16 +1203,8 @@ static int drm_dp_mst_wait_tx_reply(struct drm_dp_mst_branch *mstb, /* remove from q */ if (txmsg->state == DRM_DP_SIDEBAND_TX_QUEUED || - txmsg->state == DRM_DP_SIDEBAND_TX_START_SEND) { + txmsg->state == DRM_DP_SIDEBAND_TX_START_SEND) list_del(&txmsg->next); - } - - if (txmsg->state == DRM_DP_SIDEBAND_TX_START_SEND || - txmsg->state == DRM_DP_SIDEBAND_TX_SENT) { - mstb->tx_slots[txmsg->seqno] = NULL; - } - mgr->is_waiting_for_dwn_reply = false; - } out: if (unlikely(ret == -EIO) && drm_debug_enabled(DRM_UT_DP)) { @@ -2691,22 +2683,6 @@ static int set_hdr_from_dst_qlock(struct drm_dp_sideband_msg_hdr *hdr, struct drm_dp_mst_branch *mstb = txmsg->dst; u8 req_type; - /* both msg slots are full */ - if (txmsg->seqno == -1) { - if (mstb->tx_slots[0] && mstb->tx_slots[1]) { - DRM_DEBUG_KMS("%s: failed to find slot\n", __func__); - return -EAGAIN; - } - if (mstb->tx_slots[0] == NULL && mstb->tx_slots[1] == NULL) { - txmsg->seqno = mstb->last_seqno; - mstb->last_seqno ^= 1; - } else if (mstb->tx_slots[0] == NULL) - txmsg->seqno = 0; - else - txmsg->seqno = 1; - mstb->tx_slots[txmsg->seqno] = txmsg; - } - req_type = txmsg->msg[0] & 0x7f; if (req_type == DP_CONNECTION_STATUS_NOTIFY || req_type == DP_RESOURCE_STATUS_NOTIFY) @@ -2718,7 +2694,7 @@ static int set_hdr_from_dst_qlock(struct drm_dp_sideband_msg_hdr *hdr, hdr->lcr = mstb->lct - 1; if (mstb->lct > 1) memcpy(hdr->rad, mstb->rad, mstb->lct / 2); - hdr->seqno = txmsg->seqno; + return 0; } /* @@ -2733,15 +2709,15 @@ static int process_single_tx_qlock(struct drm_dp_mst_topology_mgr *mgr, int len, space, idx, tosend; int ret; + if (txmsg->state == DRM_DP_SIDEBAND_TX_SENT) + return 0; + memset(&hdr, 0, sizeof(struct drm_dp_sideband_msg_hdr)); - if (txmsg->state == DRM_DP_SIDEBAND_TX_QUEUED) { - txmsg->seqno = -1; + if (txmsg->state == DRM_DP_SIDEBAND_TX_QUEUED) txmsg->state = DRM_DP_SIDEBAND_TX_START_SEND; - } - /* make hdr from dst mst - for replies use seqno - otherwise assign one */ + /* make hdr from dst mst */ ret = set_hdr_from_dst_qlock(&hdr, txmsg); if (ret < 0) return ret; @@ -2794,42 +2770,17 @@ static void process_single_down_tx_qlock(struct drm_dp_mst_topology_mgr *mgr) if (list_empty(&mgr->tx_msg_downq)) return; - txmsg = list_first_entry(&mgr->tx_msg_downq, struct drm_dp_sideband_msg_tx, next); + txmsg = list_first_entry(&mgr->tx_msg_downq, + struct drm_dp_sideband_msg_tx, next); ret = process_single_tx_qlock(mgr, txmsg, false); - if (ret == 1) { - /* txmsg is sent it should be in the slots now */ - mgr->is_waiting_for_dwn_reply = true; - list_del(&txmsg->next); - } else if (ret) { + if (ret < 0) { DRM_DEBUG_KMS("failed to send msg in q %d\n", ret); - mgr->is_waiting_for_dwn_reply = false; list_del(&txmsg->next); - if (txmsg->seqno != -1) - txmsg->dst->tx_slots[txmsg->seqno] = NULL; txmsg->state = DRM_DP_SIDEBAND_TX_TIMEOUT; wake_up_all(&mgr->tx_waitq); } } -/* called holding qlock */ -static void process_single_up_tx_qlock(struct drm_dp_mst_topology_mgr *mgr, - struct drm_dp_sideband_msg_tx *txmsg) -{ - int ret; - - /* construct a chunk from the first msg in the tx_msg queue */ - ret = process_single_tx_qlock(mgr, txmsg, true); - - if (ret != 1) - DRM_DEBUG_KMS("failed to send msg in q %d\n", ret); - - if (txmsg->seqno != -1) { - WARN_ON((unsigned int)txmsg->seqno > - ARRAY_SIZE(txmsg->dst->tx_slots)); - txmsg->dst->tx_slots[txmsg->seqno] = NULL; - } -} - static void drm_dp_queue_down_tx(struct drm_dp_mst_topology_mgr *mgr, struct drm_dp_sideband_msg_tx *txmsg) { @@ -2842,8 +2793,7 @@ static void drm_dp_queue_down_tx(struct drm_dp_mst_topology_mgr *mgr, drm_dp_mst_dump_sideband_msg_tx(&p, txmsg); } - if (list_is_singular(&mgr->tx_msg_downq) && - !mgr->is_waiting_for_dwn_reply) + if (list_is_singular(&mgr->tx_msg_downq)) process_single_down_tx_qlock(mgr); mutex_unlock(&mgr->qlock); } @@ -3467,7 +3417,7 @@ static int drm_dp_encode_up_ack_reply(struct drm_dp_sideband_msg_tx *msg, u8 req static int drm_dp_send_up_ack_reply(struct drm_dp_mst_topology_mgr *mgr, struct drm_dp_mst_branch *mstb, - int req_type, int seqno, bool broadcast) + int req_type, bool broadcast) { struct drm_dp_sideband_msg_tx *txmsg; @@ -3476,13 +3426,11 @@ static int drm_dp_send_up_ack_reply(struct drm_dp_mst_topology_mgr *mgr, return -ENOMEM; txmsg->dst = mstb; - txmsg->seqno = seqno; drm_dp_encode_up_ack_reply(txmsg, req_type); mutex_lock(&mgr->qlock); - - process_single_up_tx_qlock(mgr, txmsg); - + /* construct a chunk from the first msg in the tx_msg queue */ + process_single_tx_qlock(mgr, txmsg, true); mutex_unlock(&mgr->qlock); kfree(txmsg); @@ -3707,7 +3655,8 @@ int drm_dp_mst_topology_mgr_resume(struct drm_dp_mst_topology_mgr *mgr, } EXPORT_SYMBOL(drm_dp_mst_topology_mgr_resume); -static bool drm_dp_get_one_sb_msg(struct drm_dp_mst_topology_mgr *mgr, bool up) +static bool drm_dp_get_one_sb_msg(struct drm_dp_mst_topology_mgr *mgr, + bool up) { int len; u8 replyblock[32]; @@ -3760,7 +3709,6 @@ static int drm_dp_mst_handle_down_rep(struct drm_dp_mst_topology_mgr *mgr) struct drm_dp_sideband_msg_tx *txmsg; struct drm_dp_mst_branch *mstb; struct drm_dp_sideband_msg_hdr *hdr = &mgr->down_rep_recv.initial_hdr; - int slot = -1; if (!drm_dp_get_one_sb_msg(mgr, false)) goto clear_down_rep_recv; @@ -3776,10 +3724,9 @@ static int drm_dp_mst_handle_down_rep(struct drm_dp_mst_topology_mgr *mgr) } /* find the message */ - slot = hdr->seqno; mutex_lock(&mgr->qlock); - txmsg = mstb->tx_slots[slot]; - /* remove from slots */ + txmsg = list_first_entry_or_null(&mgr->tx_msg_downq, + struct drm_dp_sideband_msg_tx, next); mutex_unlock(&mgr->qlock); if (!txmsg) { @@ -3804,8 +3751,7 @@ static int drm_dp_mst_handle_down_rep(struct drm_dp_mst_topology_mgr *mgr) mutex_lock(&mgr->qlock); txmsg->state = DRM_DP_SIDEBAND_TX_RX; - mstb->tx_slots[slot] = NULL; - mgr->is_waiting_for_dwn_reply = false; + list_del(&txmsg->next); mutex_unlock(&mgr->qlock); wake_up_all(&mgr->tx_waitq); @@ -3815,9 +3761,6 @@ static int drm_dp_mst_handle_down_rep(struct drm_dp_mst_topology_mgr *mgr) no_msg: drm_dp_mst_topology_put_mstb(mstb); clear_down_rep_recv: - mutex_lock(&mgr->qlock); - mgr->is_waiting_for_dwn_reply = false; - mutex_unlock(&mgr->qlock); memset(&mgr->down_rep_recv, 0, sizeof(struct drm_dp_sideband_msg_rx)); return 0; @@ -3896,7 +3839,6 @@ static int drm_dp_mst_handle_up_req(struct drm_dp_mst_topology_mgr *mgr) { struct drm_dp_sideband_msg_hdr *hdr = &mgr->up_req_recv.initial_hdr; struct drm_dp_pending_up_req *up_req; - bool seqno; if (!drm_dp_get_one_sb_msg(mgr, true)) goto out; @@ -3911,7 +3853,6 @@ static int drm_dp_mst_handle_up_req(struct drm_dp_mst_topology_mgr *mgr) } INIT_LIST_HEAD(&up_req->next); - seqno = hdr->seqno; drm_dp_sideband_parse_req(&mgr->up_req_recv, &up_req->msg); if (up_req->msg.req_type != DP_CONNECTION_STATUS_NOTIFY && @@ -3923,7 +3864,7 @@ static int drm_dp_mst_handle_up_req(struct drm_dp_mst_topology_mgr *mgr) } drm_dp_send_up_ack_reply(mgr, mgr->mst_primary, up_req->msg.req_type, - seqno, false); + false); if (up_req->msg.req_type == DP_CONNECTION_STATUS_NOTIFY) { const struct drm_dp_connection_status_notify *conn_stat = @@ -4674,7 +4615,7 @@ static void drm_dp_tx_work(struct work_struct *work) struct drm_dp_mst_topology_mgr *mgr = container_of(work, struct drm_dp_mst_topology_mgr, tx_work); mutex_lock(&mgr->qlock); - if (!list_empty(&mgr->tx_msg_downq) && !mgr->is_waiting_for_dwn_reply) + if (!list_empty(&mgr->tx_msg_downq)) process_single_down_tx_qlock(mgr); mutex_unlock(&mgr->qlock); } @@ -4705,26 +4646,25 @@ static inline void drm_dp_delayed_destroy_mstb(struct drm_dp_mst_branch *mstb) { struct drm_dp_mst_topology_mgr *mgr = mstb->mgr; - struct drm_dp_mst_port *port, *tmp; + struct drm_dp_mst_port *port, *port_tmp; + struct drm_dp_sideband_msg_tx *txmsg, *txmsg_tmp; bool wake_tx = false; mutex_lock(&mgr->lock); - list_for_each_entry_safe(port, tmp, &mstb->ports, next) { + list_for_each_entry_safe(port, port_tmp, &mstb->ports, next) { list_del(&port->next); drm_dp_mst_topology_put_port(port); } mutex_unlock(&mgr->lock); - /* drop any tx slots msg */ + /* drop any tx slot msg */ mutex_lock(&mstb->mgr->qlock); - if (mstb->tx_slots[0]) { - mstb->tx_slots[0]->state = DRM_DP_SIDEBAND_TX_TIMEOUT; - mstb->tx_slots[0] = NULL; - wake_tx = true; - } - if (mstb->tx_slots[1]) { - mstb->tx_slots[1]->state = DRM_DP_SIDEBAND_TX_TIMEOUT; - mstb->tx_slots[1] = NULL; + list_for_each_entry_safe(txmsg, txmsg_tmp, &mgr->tx_msg_downq, next) { + if (txmsg->dst != mstb) + continue; + + txmsg->state = DRM_DP_SIDEBAND_TX_TIMEOUT; + list_del(&txmsg->next); wake_tx = true; } mutex_unlock(&mstb->mgr->qlock); diff --git a/include/drm/drm_dp_mst_helper.h b/include/drm/drm_dp_mst_helper.h index 3cde42b333c3..644eca37cb94 100644 --- a/include/drm/drm_dp_mst_helper.h +++ b/include/drm/drm_dp_mst_helper.h @@ -165,11 +165,8 @@ struct drm_dp_mst_port { * @rad: Relative Address to talk to this branch device. * @lct: Link count total to talk to this branch device. * @num_ports: number of ports on the branch. - * @msg_slots: one bit per transmitted msg slot. * @port_parent: pointer to the port parent, NULL if toplevel. * @mgr: topology manager for this branch device. - * @tx_slots: transmission slots for this device. - * @last_seqno: last sequence number used to talk to this. * @link_address_sent: if a link address message has been sent to this device yet. * @guid: guid for DP 1.2 branch device. port under this branch can be * identified by port #. @@ -210,7 +207,6 @@ struct drm_dp_mst_branch { u8 lct; int num_ports; - int msg_slots; /** * @ports: the list of ports on this branch device. This should be * considered protected for reading by &drm_dp_mst_topology_mgr.lock. @@ -223,13 +219,9 @@ struct drm_dp_mst_branch { */ struct list_head ports; - /* list of tx ops queue for this port */ struct drm_dp_mst_port *port_parent; struct drm_dp_mst_topology_mgr *mgr; - /* slots are protected by mstb->mgr->qlock */ - struct drm_dp_sideband_msg_tx *tx_slots[2]; - int last_seqno; bool link_address_sent; /* global unique identifier to identify branch devices */ @@ -589,11 +581,6 @@ struct drm_dp_mst_topology_mgr { */ bool payload_id_table_cleared : 1; - /** - * @is_waiting_for_dwn_reply: whether we're waiting for a down reply. - */ - bool is_waiting_for_dwn_reply : 1; - /** * @mst_primary: Pointer to the primary/first branch device. */ @@ -618,13 +605,12 @@ struct drm_dp_mst_topology_mgr { const struct drm_private_state_funcs *funcs; /** - * @qlock: protects @tx_msg_downq, the &drm_dp_mst_branch.txslost and - * &drm_dp_sideband_msg_tx.state once they are queued + * @qlock: protects @tx_msg_downq and &drm_dp_sideband_msg_tx.state */ struct mutex qlock; /** - * @tx_msg_downq: List of pending down replies. + * @tx_msg_downq: List of pending down requests */ struct list_head tx_msg_downq; -- 2.25.3 _______________________________________________ dri-devel mailing list dri-devel@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/dri-devel ^ permalink raw reply related [flat|nested] 6+ messages in thread
* [PATCH 1/1] drm/dp_mst: Kill the second sideband tx slot, save the world @ 2020-04-27 21:34 ` Lyude Paul 0 siblings, 0 replies; 6+ messages in thread From: Lyude Paul @ 2020-04-27 21:34 UTC (permalink / raw) To: dri-devel Cc: Maxime Ripard, Maarten Lankhorst, Sean Paul, Lin, Wayne, stable, David Airlie, Daniel Vetter, Todd Previte, Dave Airlie, linux-kernel While we support using both tx slots for sideband transmissions, it appears that DisplayPort devices in the field didn't end up doing a very good job of supporting it. From section 5.2.1 of the DP 2.0 specification: There are MST Sink/Branch devices in the field that do not handle interleaved message transactions. To facilitate message transaction handling by downstream devices, an MST Source device shall generate message transactions in an atomic manner (i.e., the MST Source device shall not concurrently interleave multiple message transactions). Therefore, an MST Source device shall clear the Message_Sequence_No value in the Sideband_MSG_Header to 0. This might come as a bit of a surprise since the vast majority of hubs will support using both tx slots even if they don't support interleaved message transactions, and we've also been using both tx slots since MST was introduced into the kernel. However, there is one device we've had trouble getting working consistently with MST for so long that we actually assumed it was just broken: the infamous Dell P2415Qb. Previously this monitor would appear to work sometimes, but in most situations would end up timing out LINK_ADDRESS messages almost at random until you power cycled the whole display. After reading section 5.2.1 in the DP 2.0 spec, some closer investigation into this infamous display revealed it was only ever timing out on sideband messages in the second TX slot. Sure enough, avoiding the second TX slot has suddenly made this monitor function perfectly for the first time in five years. And since they explicitly mention this in the specification, I doubt this is the only monitor out there with this issue. This might even explain explain the seemingly harmless garbage sideband responses we would occasionally see with MST hubs! So - rewrite our sideband TX handlers to only support one TX slot. In order to simplify our sideband handling now that we don't support transmitting to multiple MSTBs at once, we also move all state tracking for down replies from mstbs to the topology manager. Signed-off-by: Lyude Paul <lyude@redhat.com> Fixes: ad7f8a1f9ced ("drm/helper: add Displayport multi-stream helper (v0.6)") Cc: Sean Paul <sean@poorly.run> Cc: "Lin, Wayne" <Wayne.Lin@amd.com> Cc: <stable@vger.kernel.org> # v3.17+ Reviewed-by: Sean Paul <sean@poorly.run> Link: https://patchwork.freedesktop.org/patch/msgid/20200424181308.770749-1-lyude@redhat.com --- drivers/gpu/drm/drm_dp_mst_topology.c | 122 +++++++------------------- include/drm/drm_dp_mst_helper.h | 18 +--- 2 files changed, 33 insertions(+), 107 deletions(-) diff --git a/drivers/gpu/drm/drm_dp_mst_topology.c b/drivers/gpu/drm/drm_dp_mst_topology.c index 9d89ebf3a749..ed6faaf4bbf3 100644 --- a/drivers/gpu/drm/drm_dp_mst_topology.c +++ b/drivers/gpu/drm/drm_dp_mst_topology.c @@ -1203,16 +1203,8 @@ static int drm_dp_mst_wait_tx_reply(struct drm_dp_mst_branch *mstb, /* remove from q */ if (txmsg->state == DRM_DP_SIDEBAND_TX_QUEUED || - txmsg->state == DRM_DP_SIDEBAND_TX_START_SEND) { + txmsg->state == DRM_DP_SIDEBAND_TX_START_SEND) list_del(&txmsg->next); - } - - if (txmsg->state == DRM_DP_SIDEBAND_TX_START_SEND || - txmsg->state == DRM_DP_SIDEBAND_TX_SENT) { - mstb->tx_slots[txmsg->seqno] = NULL; - } - mgr->is_waiting_for_dwn_reply = false; - } out: if (unlikely(ret == -EIO) && drm_debug_enabled(DRM_UT_DP)) { @@ -2691,22 +2683,6 @@ static int set_hdr_from_dst_qlock(struct drm_dp_sideband_msg_hdr *hdr, struct drm_dp_mst_branch *mstb = txmsg->dst; u8 req_type; - /* both msg slots are full */ - if (txmsg->seqno == -1) { - if (mstb->tx_slots[0] && mstb->tx_slots[1]) { - DRM_DEBUG_KMS("%s: failed to find slot\n", __func__); - return -EAGAIN; - } - if (mstb->tx_slots[0] == NULL && mstb->tx_slots[1] == NULL) { - txmsg->seqno = mstb->last_seqno; - mstb->last_seqno ^= 1; - } else if (mstb->tx_slots[0] == NULL) - txmsg->seqno = 0; - else - txmsg->seqno = 1; - mstb->tx_slots[txmsg->seqno] = txmsg; - } - req_type = txmsg->msg[0] & 0x7f; if (req_type == DP_CONNECTION_STATUS_NOTIFY || req_type == DP_RESOURCE_STATUS_NOTIFY) @@ -2718,7 +2694,7 @@ static int set_hdr_from_dst_qlock(struct drm_dp_sideband_msg_hdr *hdr, hdr->lcr = mstb->lct - 1; if (mstb->lct > 1) memcpy(hdr->rad, mstb->rad, mstb->lct / 2); - hdr->seqno = txmsg->seqno; + return 0; } /* @@ -2733,15 +2709,15 @@ static int process_single_tx_qlock(struct drm_dp_mst_topology_mgr *mgr, int len, space, idx, tosend; int ret; + if (txmsg->state == DRM_DP_SIDEBAND_TX_SENT) + return 0; + memset(&hdr, 0, sizeof(struct drm_dp_sideband_msg_hdr)); - if (txmsg->state == DRM_DP_SIDEBAND_TX_QUEUED) { - txmsg->seqno = -1; + if (txmsg->state == DRM_DP_SIDEBAND_TX_QUEUED) txmsg->state = DRM_DP_SIDEBAND_TX_START_SEND; - } - /* make hdr from dst mst - for replies use seqno - otherwise assign one */ + /* make hdr from dst mst */ ret = set_hdr_from_dst_qlock(&hdr, txmsg); if (ret < 0) return ret; @@ -2794,42 +2770,17 @@ static void process_single_down_tx_qlock(struct drm_dp_mst_topology_mgr *mgr) if (list_empty(&mgr->tx_msg_downq)) return; - txmsg = list_first_entry(&mgr->tx_msg_downq, struct drm_dp_sideband_msg_tx, next); + txmsg = list_first_entry(&mgr->tx_msg_downq, + struct drm_dp_sideband_msg_tx, next); ret = process_single_tx_qlock(mgr, txmsg, false); - if (ret == 1) { - /* txmsg is sent it should be in the slots now */ - mgr->is_waiting_for_dwn_reply = true; - list_del(&txmsg->next); - } else if (ret) { + if (ret < 0) { DRM_DEBUG_KMS("failed to send msg in q %d\n", ret); - mgr->is_waiting_for_dwn_reply = false; list_del(&txmsg->next); - if (txmsg->seqno != -1) - txmsg->dst->tx_slots[txmsg->seqno] = NULL; txmsg->state = DRM_DP_SIDEBAND_TX_TIMEOUT; wake_up_all(&mgr->tx_waitq); } } -/* called holding qlock */ -static void process_single_up_tx_qlock(struct drm_dp_mst_topology_mgr *mgr, - struct drm_dp_sideband_msg_tx *txmsg) -{ - int ret; - - /* construct a chunk from the first msg in the tx_msg queue */ - ret = process_single_tx_qlock(mgr, txmsg, true); - - if (ret != 1) - DRM_DEBUG_KMS("failed to send msg in q %d\n", ret); - - if (txmsg->seqno != -1) { - WARN_ON((unsigned int)txmsg->seqno > - ARRAY_SIZE(txmsg->dst->tx_slots)); - txmsg->dst->tx_slots[txmsg->seqno] = NULL; - } -} - static void drm_dp_queue_down_tx(struct drm_dp_mst_topology_mgr *mgr, struct drm_dp_sideband_msg_tx *txmsg) { @@ -2842,8 +2793,7 @@ static void drm_dp_queue_down_tx(struct drm_dp_mst_topology_mgr *mgr, drm_dp_mst_dump_sideband_msg_tx(&p, txmsg); } - if (list_is_singular(&mgr->tx_msg_downq) && - !mgr->is_waiting_for_dwn_reply) + if (list_is_singular(&mgr->tx_msg_downq)) process_single_down_tx_qlock(mgr); mutex_unlock(&mgr->qlock); } @@ -3467,7 +3417,7 @@ static int drm_dp_encode_up_ack_reply(struct drm_dp_sideband_msg_tx *msg, u8 req static int drm_dp_send_up_ack_reply(struct drm_dp_mst_topology_mgr *mgr, struct drm_dp_mst_branch *mstb, - int req_type, int seqno, bool broadcast) + int req_type, bool broadcast) { struct drm_dp_sideband_msg_tx *txmsg; @@ -3476,13 +3426,11 @@ static int drm_dp_send_up_ack_reply(struct drm_dp_mst_topology_mgr *mgr, return -ENOMEM; txmsg->dst = mstb; - txmsg->seqno = seqno; drm_dp_encode_up_ack_reply(txmsg, req_type); mutex_lock(&mgr->qlock); - - process_single_up_tx_qlock(mgr, txmsg); - + /* construct a chunk from the first msg in the tx_msg queue */ + process_single_tx_qlock(mgr, txmsg, true); mutex_unlock(&mgr->qlock); kfree(txmsg); @@ -3707,7 +3655,8 @@ int drm_dp_mst_topology_mgr_resume(struct drm_dp_mst_topology_mgr *mgr, } EXPORT_SYMBOL(drm_dp_mst_topology_mgr_resume); -static bool drm_dp_get_one_sb_msg(struct drm_dp_mst_topology_mgr *mgr, bool up) +static bool drm_dp_get_one_sb_msg(struct drm_dp_mst_topology_mgr *mgr, + bool up) { int len; u8 replyblock[32]; @@ -3760,7 +3709,6 @@ static int drm_dp_mst_handle_down_rep(struct drm_dp_mst_topology_mgr *mgr) struct drm_dp_sideband_msg_tx *txmsg; struct drm_dp_mst_branch *mstb; struct drm_dp_sideband_msg_hdr *hdr = &mgr->down_rep_recv.initial_hdr; - int slot = -1; if (!drm_dp_get_one_sb_msg(mgr, false)) goto clear_down_rep_recv; @@ -3776,10 +3724,9 @@ static int drm_dp_mst_handle_down_rep(struct drm_dp_mst_topology_mgr *mgr) } /* find the message */ - slot = hdr->seqno; mutex_lock(&mgr->qlock); - txmsg = mstb->tx_slots[slot]; - /* remove from slots */ + txmsg = list_first_entry_or_null(&mgr->tx_msg_downq, + struct drm_dp_sideband_msg_tx, next); mutex_unlock(&mgr->qlock); if (!txmsg) { @@ -3804,8 +3751,7 @@ static int drm_dp_mst_handle_down_rep(struct drm_dp_mst_topology_mgr *mgr) mutex_lock(&mgr->qlock); txmsg->state = DRM_DP_SIDEBAND_TX_RX; - mstb->tx_slots[slot] = NULL; - mgr->is_waiting_for_dwn_reply = false; + list_del(&txmsg->next); mutex_unlock(&mgr->qlock); wake_up_all(&mgr->tx_waitq); @@ -3815,9 +3761,6 @@ static int drm_dp_mst_handle_down_rep(struct drm_dp_mst_topology_mgr *mgr) no_msg: drm_dp_mst_topology_put_mstb(mstb); clear_down_rep_recv: - mutex_lock(&mgr->qlock); - mgr->is_waiting_for_dwn_reply = false; - mutex_unlock(&mgr->qlock); memset(&mgr->down_rep_recv, 0, sizeof(struct drm_dp_sideband_msg_rx)); return 0; @@ -3896,7 +3839,6 @@ static int drm_dp_mst_handle_up_req(struct drm_dp_mst_topology_mgr *mgr) { struct drm_dp_sideband_msg_hdr *hdr = &mgr->up_req_recv.initial_hdr; struct drm_dp_pending_up_req *up_req; - bool seqno; if (!drm_dp_get_one_sb_msg(mgr, true)) goto out; @@ -3911,7 +3853,6 @@ static int drm_dp_mst_handle_up_req(struct drm_dp_mst_topology_mgr *mgr) } INIT_LIST_HEAD(&up_req->next); - seqno = hdr->seqno; drm_dp_sideband_parse_req(&mgr->up_req_recv, &up_req->msg); if (up_req->msg.req_type != DP_CONNECTION_STATUS_NOTIFY && @@ -3923,7 +3864,7 @@ static int drm_dp_mst_handle_up_req(struct drm_dp_mst_topology_mgr *mgr) } drm_dp_send_up_ack_reply(mgr, mgr->mst_primary, up_req->msg.req_type, - seqno, false); + false); if (up_req->msg.req_type == DP_CONNECTION_STATUS_NOTIFY) { const struct drm_dp_connection_status_notify *conn_stat = @@ -4674,7 +4615,7 @@ static void drm_dp_tx_work(struct work_struct *work) struct drm_dp_mst_topology_mgr *mgr = container_of(work, struct drm_dp_mst_topology_mgr, tx_work); mutex_lock(&mgr->qlock); - if (!list_empty(&mgr->tx_msg_downq) && !mgr->is_waiting_for_dwn_reply) + if (!list_empty(&mgr->tx_msg_downq)) process_single_down_tx_qlock(mgr); mutex_unlock(&mgr->qlock); } @@ -4705,26 +4646,25 @@ static inline void drm_dp_delayed_destroy_mstb(struct drm_dp_mst_branch *mstb) { struct drm_dp_mst_topology_mgr *mgr = mstb->mgr; - struct drm_dp_mst_port *port, *tmp; + struct drm_dp_mst_port *port, *port_tmp; + struct drm_dp_sideband_msg_tx *txmsg, *txmsg_tmp; bool wake_tx = false; mutex_lock(&mgr->lock); - list_for_each_entry_safe(port, tmp, &mstb->ports, next) { + list_for_each_entry_safe(port, port_tmp, &mstb->ports, next) { list_del(&port->next); drm_dp_mst_topology_put_port(port); } mutex_unlock(&mgr->lock); - /* drop any tx slots msg */ + /* drop any tx slot msg */ mutex_lock(&mstb->mgr->qlock); - if (mstb->tx_slots[0]) { - mstb->tx_slots[0]->state = DRM_DP_SIDEBAND_TX_TIMEOUT; - mstb->tx_slots[0] = NULL; - wake_tx = true; - } - if (mstb->tx_slots[1]) { - mstb->tx_slots[1]->state = DRM_DP_SIDEBAND_TX_TIMEOUT; - mstb->tx_slots[1] = NULL; + list_for_each_entry_safe(txmsg, txmsg_tmp, &mgr->tx_msg_downq, next) { + if (txmsg->dst != mstb) + continue; + + txmsg->state = DRM_DP_SIDEBAND_TX_TIMEOUT; + list_del(&txmsg->next); wake_tx = true; } mutex_unlock(&mstb->mgr->qlock); diff --git a/include/drm/drm_dp_mst_helper.h b/include/drm/drm_dp_mst_helper.h index 3cde42b333c3..644eca37cb94 100644 --- a/include/drm/drm_dp_mst_helper.h +++ b/include/drm/drm_dp_mst_helper.h @@ -165,11 +165,8 @@ struct drm_dp_mst_port { * @rad: Relative Address to talk to this branch device. * @lct: Link count total to talk to this branch device. * @num_ports: number of ports on the branch. - * @msg_slots: one bit per transmitted msg slot. * @port_parent: pointer to the port parent, NULL if toplevel. * @mgr: topology manager for this branch device. - * @tx_slots: transmission slots for this device. - * @last_seqno: last sequence number used to talk to this. * @link_address_sent: if a link address message has been sent to this device yet. * @guid: guid for DP 1.2 branch device. port under this branch can be * identified by port #. @@ -210,7 +207,6 @@ struct drm_dp_mst_branch { u8 lct; int num_ports; - int msg_slots; /** * @ports: the list of ports on this branch device. This should be * considered protected for reading by &drm_dp_mst_topology_mgr.lock. @@ -223,13 +219,9 @@ struct drm_dp_mst_branch { */ struct list_head ports; - /* list of tx ops queue for this port */ struct drm_dp_mst_port *port_parent; struct drm_dp_mst_topology_mgr *mgr; - /* slots are protected by mstb->mgr->qlock */ - struct drm_dp_sideband_msg_tx *tx_slots[2]; - int last_seqno; bool link_address_sent; /* global unique identifier to identify branch devices */ @@ -589,11 +581,6 @@ struct drm_dp_mst_topology_mgr { */ bool payload_id_table_cleared : 1; - /** - * @is_waiting_for_dwn_reply: whether we're waiting for a down reply. - */ - bool is_waiting_for_dwn_reply : 1; - /** * @mst_primary: Pointer to the primary/first branch device. */ @@ -618,13 +605,12 @@ struct drm_dp_mst_topology_mgr { const struct drm_private_state_funcs *funcs; /** - * @qlock: protects @tx_msg_downq, the &drm_dp_mst_branch.txslost and - * &drm_dp_sideband_msg_tx.state once they are queued + * @qlock: protects @tx_msg_downq and &drm_dp_sideband_msg_tx.state */ struct mutex qlock; /** - * @tx_msg_downq: List of pending down replies. + * @tx_msg_downq: List of pending down requests */ struct list_head tx_msg_downq; -- 2.25.3 ^ permalink raw reply related [flat|nested] 6+ messages in thread
* Re: [PATCH 1/1] drm/dp_mst: Kill the second sideband tx slot, save the world 2020-04-27 21:34 ` Lyude Paul @ 2020-05-01 2:55 ` Sasha Levin -1 siblings, 0 replies; 6+ messages in thread From: Sasha Levin @ 2020-05-01 2:55 UTC (permalink / raw) To: Sasha Levin, Lyude Paul, dri-devel; +Cc: Sean Paul, stable, Lin, Wayne Hi [This is an automated email] This commit has been processed because it contains a "Fixes:" tag fixing commit: ad7f8a1f9ced ("drm/helper: add Displayport multi-stream helper (v0.6)"). The bot has tested the following trees: v5.6.7, v5.4.35, v4.19.118, v4.14.177, v4.9.220, v4.4.220. v5.6.7: Failed to apply! Possible dependencies: 1cfff5f01563 ("drm/dp_mst: Convert drm_dp_mst_topology_mgr.is_waiting_for_dwn_reply to bitfield") v5.4.35: Failed to apply! Possible dependencies: 14692a3637d4 ("drm/dp_mst: Add probe_lock") 2f015ec6eab6 ("drm/dp_mst: Add sideband down request tracing + selftests") 37dfdc55ffeb ("drm/dp_mst: Cleanup drm_dp_send_link_address() a bit") 50094b5dcd32 ("drm/dp_mst: Destroy topology_mgr mutexes") 5950f0b797fc ("drm/dp_mst: Move link address dumping into a function") 5a64967a2f3b ("drm/dp_mst: Have DP_Tx send one msg at a time") 60f9ae9d0d3d ("drm/dp_mst: Remove huge conditional in drm_dp_mst_handle_up_req()") 7cb12d48314e ("drm/dp_mst: Destroy MSTBs asynchronously") 7cbce45d6243 ("drm/dp_mst: Move test_calc_pbn_mode() into an actual selftest") 8b1e589d138c ("drm/dp_mst: Refactor drm_dp_mst_handle_down_rep()") 9408cc94eb04 ("drm/dp_mst: Handle UP requests asynchronously") a29d881875fc ("drm/dp_mst: Refactor drm_dp_mst_handle_up_req()") caf81ec6cd72 ("drm: Destroy the correct mutex name in drm_dp_mst_topology_mgr_destroy") e2839ff692c6 ("drm/dp_mst: Rename drm_dp_add_port and drm_dp_update_port") v4.19.118: Failed to apply! Possible dependencies: 16bff572cc66 ("drm/dp-mst-helper: Remove hotplug callback") 19b85cfabf5c ("drm/bochs: move remaining fb bits to kms") 2f015ec6eab6 ("drm/dp_mst: Add sideband down request tracing + selftests") 2f69deb1d9a1 ("drm/arcpgu: prepare for drmP.h removal from drm_modeset_helper.h") 48b442238250 ("drm/bochs: fix DRM_FORMAT_* handling for big endian machines.") 562836a269e3 ("drm/dp_mst: Enable registration of AUX devices for MST ports") 580fc13f3ee4 ("drm/dp: drmP.h include removal") 5a64967a2f3b ("drm/dp_mst: Have DP_Tx send one msg at a time") 6579c39594ae ("drm/bochs: atomic: switch planes to atomic, wire up helpers.") 6abb49402a79 ("drm/bridge: cdns: prepare for drmP.h removal from drm_modeset_helper.h") 6c76c0eb031f ("drm/bridge: ti-sn65dsi86: Fixup register names") 7780eb9ce80f ("bochs: convert to drm_dev_register") 86351de023dd ("drm/bochs: support changing byteorder at mode set time") a095f15c00e2 ("drm/bridge: add support for sn65dsi86 bridge driver") b814ec6d4535 ("drm/bridge: ti-sn65dsi86: Implement AUX channel") df2052cc9221 ("bochs: convert to drm_fb_helper_fbdev_setup/teardown") f38b7cca6d0e ("drm/bridge: tc358764: Add DSI to LVDS bridge driver") fcd70cd36b9b ("drm: Split out drm_probe_helper.h") fe1f664a3609 ("drm/arc: do not rely on drmP.h from drm_gem_cma_helper.h") v4.14.177: Failed to apply! Possible dependencies: 1b0c0f9dc5ca ("drm/amdgpu: move userptr BOs to CPU domain during CS v2") 1ed3d2567c80 ("drm/amdgpu: keep the MMU lock until the update ends v4") 2f015ec6eab6 ("drm/dp_mst: Add sideband down request tracing + selftests") 3fe89771cb0a ("drm/amdgpu: stop reserving the BO in the MMU callback v3") 4562236b3bc0 ("drm/amd/dc: Add dc display driver (v2)") 562836a269e3 ("drm/dp_mst: Enable registration of AUX devices for MST ports") 580fc13f3ee4 ("drm/dp: drmP.h include removal") 5a64967a2f3b ("drm/dp_mst: Have DP_Tx send one msg at a time") 60de1c1740f3 ("drm/amdgpu: use a rw_semaphore for MMU notifiers") 9a18999640fa ("drm/amdgpu: move MMU notifier related defines to amdgpu_mn.h") 9cca0b8e5df0 ("drm/amdgpu: move amdgpu_cs_sysvm_access_required into find_mapping") a216ab09955d ("drm/amdgpu: fix userptr put_page handling") b72cf4fca2bb ("drm/amdgpu: move taking mmap_sem into get_user_pages v2") ca666a3c298f ("drm/amdgpu: stop using BO status for user pages") fcd70cd36b9b ("drm: Split out drm_probe_helper.h") v4.9.220: Failed to apply! Possible dependencies: 178e32c224d2 ("drm/atomic: Remove pointless private object NULL state check") 1cec20f0ea0e ("dma-buf: Restart reservation_object_wait_timeout_rcu() after writes") 2f015ec6eab6 ("drm/dp_mst: Add sideband down request tracing + selftests") 3941dae15ed9 ("drm_dp_aux_dev: switch to read_iter/write_iter") 3f3353b7e121 ("drm/dp: Introduce MST topology state to track available link bandwidth") 562836a269e3 ("drm/dp_mst: Enable registration of AUX devices for MST ports") 580fc13f3ee4 ("drm/dp: drmP.h include removal") 5a64967a2f3b ("drm/dp_mst: Have DP_Tx send one msg at a time") 6806cdf9aa1c ("drm/kms-helpers: Use recommened kerneldoc for struct member refs") 78010cd9736e ("dma-buf/fence: add an lockdep_assert_held()") 9498c19b3f53 ("drm: Move tile group code into drm_connector.c") 9a83a71ac0d5 ("drm/fences: add DOC: for explicit fencing") a4370c777406 ("drm/atomic: Make private objs proper objects") b430c27a7de3 ("drm: Add driver-private objects to atomic state") beaf5af48034 ("drm/fence: add out-fences support") d807ed1c55fb ("drm: atomic: Clarify documentation around drm_atomic_crtc_needs_modeset") ea0dd85a75f1 ("drm/doc: use preferred struct reference in kernel-doc") f54d1867005c ("dma-buf: Rename struct fence to dma_fence") fedf54132d24 ("dma-buf: Restart reservation_object_get_fences_rcu() after writes") v4.4.220: Failed to apply! Possible dependencies: 22554020409f ("Documentation/gpu: use recommended order of heading markers") 22cba31bae9d ("Documentation/sphinx: add basic working Sphinx configuration and build") 2f015ec6eab6 ("drm/dp_mst: Add sideband down request tracing + selftests") 2fa91d15588c ("Documentation/gpu: split up mm, kms and kms-helpers from internals") 311b62d94c0b ("drm/doc: Reorg for drm-kms.rst") 321a95ae35f2 ("drm: Extract drm_encoder.[hc]") 36230cb5668c ("drm/dp: Allow signals to interrupt drm_aux-dev reads/writes") 3941dae15ed9 ("drm_dp_aux_dev: switch to read_iter/write_iter") 43968d7b806d ("drm: Extract drm_plane.[hc]") 522171951761 ("drm: Extract drm_connector.[hc]") 562836a269e3 ("drm/dp_mst: Enable registration of AUX devices for MST ports") 580fc13f3ee4 ("drm/dp: drmP.h include removal") 5a64967a2f3b ("drm/dp_mst: Have DP_Tx send one msg at a time") 5fff80bbdb6b ("drm/atomic: Allow for holes in connector state, v2.") 70412cfa6dde ("drm/kms_helper: Add a common place to call init and exit functions.") 96106c9729f5 ("drm: fix implicit declaration build error on ia64") 9b20fa08d3fd ("Documentation/gpu: convert the KMS properties table to CSV") a095caa7f5ec ("drm/atomic-helper: roll out commit synchronization") a4370c777406 ("drm/atomic: Make private objs proper objects") b430c27a7de3 ("drm: Add driver-private objects to atomic state") be9174a482b9 ("drm/atomic-helper: use for_each_*_in_state more") ca00c2b986ea ("Documentation/gpu: split up the gpu documentation") cb597fcea5c2 ("Documentation/gpu: add new gpu.rst converted from DocBook gpu.tmpl") e94cb37b34eb ("drm/dp: Add a drm_aux-dev module for reading/writing dpcd registers.") ede53344dbfd ("drm: Add helper for DP++ adaptors") NOTE: The patch will not be queued to stable trees until it is upstream. How should we proceed with this patch? -- Thanks Sasha _______________________________________________ dri-devel mailing list dri-devel@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/dri-devel ^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PATCH 1/1] drm/dp_mst: Kill the second sideband tx slot, save the world @ 2020-05-01 2:55 ` Sasha Levin 0 siblings, 0 replies; 6+ messages in thread From: Sasha Levin @ 2020-05-01 2:55 UTC (permalink / raw) To: Sasha Levin, Lyude Paul, dri-devel Cc: Maxime Ripard, Sean Paul, Lin, Wayne, stable Hi [This is an automated email] This commit has been processed because it contains a "Fixes:" tag fixing commit: ad7f8a1f9ced ("drm/helper: add Displayport multi-stream helper (v0.6)"). The bot has tested the following trees: v5.6.7, v5.4.35, v4.19.118, v4.14.177, v4.9.220, v4.4.220. v5.6.7: Failed to apply! Possible dependencies: 1cfff5f01563 ("drm/dp_mst: Convert drm_dp_mst_topology_mgr.is_waiting_for_dwn_reply to bitfield") v5.4.35: Failed to apply! Possible dependencies: 14692a3637d4 ("drm/dp_mst: Add probe_lock") 2f015ec6eab6 ("drm/dp_mst: Add sideband down request tracing + selftests") 37dfdc55ffeb ("drm/dp_mst: Cleanup drm_dp_send_link_address() a bit") 50094b5dcd32 ("drm/dp_mst: Destroy topology_mgr mutexes") 5950f0b797fc ("drm/dp_mst: Move link address dumping into a function") 5a64967a2f3b ("drm/dp_mst: Have DP_Tx send one msg at a time") 60f9ae9d0d3d ("drm/dp_mst: Remove huge conditional in drm_dp_mst_handle_up_req()") 7cb12d48314e ("drm/dp_mst: Destroy MSTBs asynchronously") 7cbce45d6243 ("drm/dp_mst: Move test_calc_pbn_mode() into an actual selftest") 8b1e589d138c ("drm/dp_mst: Refactor drm_dp_mst_handle_down_rep()") 9408cc94eb04 ("drm/dp_mst: Handle UP requests asynchronously") a29d881875fc ("drm/dp_mst: Refactor drm_dp_mst_handle_up_req()") caf81ec6cd72 ("drm: Destroy the correct mutex name in drm_dp_mst_topology_mgr_destroy") e2839ff692c6 ("drm/dp_mst: Rename drm_dp_add_port and drm_dp_update_port") v4.19.118: Failed to apply! Possible dependencies: 16bff572cc66 ("drm/dp-mst-helper: Remove hotplug callback") 19b85cfabf5c ("drm/bochs: move remaining fb bits to kms") 2f015ec6eab6 ("drm/dp_mst: Add sideband down request tracing + selftests") 2f69deb1d9a1 ("drm/arcpgu: prepare for drmP.h removal from drm_modeset_helper.h") 48b442238250 ("drm/bochs: fix DRM_FORMAT_* handling for big endian machines.") 562836a269e3 ("drm/dp_mst: Enable registration of AUX devices for MST ports") 580fc13f3ee4 ("drm/dp: drmP.h include removal") 5a64967a2f3b ("drm/dp_mst: Have DP_Tx send one msg at a time") 6579c39594ae ("drm/bochs: atomic: switch planes to atomic, wire up helpers.") 6abb49402a79 ("drm/bridge: cdns: prepare for drmP.h removal from drm_modeset_helper.h") 6c76c0eb031f ("drm/bridge: ti-sn65dsi86: Fixup register names") 7780eb9ce80f ("bochs: convert to drm_dev_register") 86351de023dd ("drm/bochs: support changing byteorder at mode set time") a095f15c00e2 ("drm/bridge: add support for sn65dsi86 bridge driver") b814ec6d4535 ("drm/bridge: ti-sn65dsi86: Implement AUX channel") df2052cc9221 ("bochs: convert to drm_fb_helper_fbdev_setup/teardown") f38b7cca6d0e ("drm/bridge: tc358764: Add DSI to LVDS bridge driver") fcd70cd36b9b ("drm: Split out drm_probe_helper.h") fe1f664a3609 ("drm/arc: do not rely on drmP.h from drm_gem_cma_helper.h") v4.14.177: Failed to apply! Possible dependencies: 1b0c0f9dc5ca ("drm/amdgpu: move userptr BOs to CPU domain during CS v2") 1ed3d2567c80 ("drm/amdgpu: keep the MMU lock until the update ends v4") 2f015ec6eab6 ("drm/dp_mst: Add sideband down request tracing + selftests") 3fe89771cb0a ("drm/amdgpu: stop reserving the BO in the MMU callback v3") 4562236b3bc0 ("drm/amd/dc: Add dc display driver (v2)") 562836a269e3 ("drm/dp_mst: Enable registration of AUX devices for MST ports") 580fc13f3ee4 ("drm/dp: drmP.h include removal") 5a64967a2f3b ("drm/dp_mst: Have DP_Tx send one msg at a time") 60de1c1740f3 ("drm/amdgpu: use a rw_semaphore for MMU notifiers") 9a18999640fa ("drm/amdgpu: move MMU notifier related defines to amdgpu_mn.h") 9cca0b8e5df0 ("drm/amdgpu: move amdgpu_cs_sysvm_access_required into find_mapping") a216ab09955d ("drm/amdgpu: fix userptr put_page handling") b72cf4fca2bb ("drm/amdgpu: move taking mmap_sem into get_user_pages v2") ca666a3c298f ("drm/amdgpu: stop using BO status for user pages") fcd70cd36b9b ("drm: Split out drm_probe_helper.h") v4.9.220: Failed to apply! Possible dependencies: 178e32c224d2 ("drm/atomic: Remove pointless private object NULL state check") 1cec20f0ea0e ("dma-buf: Restart reservation_object_wait_timeout_rcu() after writes") 2f015ec6eab6 ("drm/dp_mst: Add sideband down request tracing + selftests") 3941dae15ed9 ("drm_dp_aux_dev: switch to read_iter/write_iter") 3f3353b7e121 ("drm/dp: Introduce MST topology state to track available link bandwidth") 562836a269e3 ("drm/dp_mst: Enable registration of AUX devices for MST ports") 580fc13f3ee4 ("drm/dp: drmP.h include removal") 5a64967a2f3b ("drm/dp_mst: Have DP_Tx send one msg at a time") 6806cdf9aa1c ("drm/kms-helpers: Use recommened kerneldoc for struct member refs") 78010cd9736e ("dma-buf/fence: add an lockdep_assert_held()") 9498c19b3f53 ("drm: Move tile group code into drm_connector.c") 9a83a71ac0d5 ("drm/fences: add DOC: for explicit fencing") a4370c777406 ("drm/atomic: Make private objs proper objects") b430c27a7de3 ("drm: Add driver-private objects to atomic state") beaf5af48034 ("drm/fence: add out-fences support") d807ed1c55fb ("drm: atomic: Clarify documentation around drm_atomic_crtc_needs_modeset") ea0dd85a75f1 ("drm/doc: use preferred struct reference in kernel-doc") f54d1867005c ("dma-buf: Rename struct fence to dma_fence") fedf54132d24 ("dma-buf: Restart reservation_object_get_fences_rcu() after writes") v4.4.220: Failed to apply! Possible dependencies: 22554020409f ("Documentation/gpu: use recommended order of heading markers") 22cba31bae9d ("Documentation/sphinx: add basic working Sphinx configuration and build") 2f015ec6eab6 ("drm/dp_mst: Add sideband down request tracing + selftests") 2fa91d15588c ("Documentation/gpu: split up mm, kms and kms-helpers from internals") 311b62d94c0b ("drm/doc: Reorg for drm-kms.rst") 321a95ae35f2 ("drm: Extract drm_encoder.[hc]") 36230cb5668c ("drm/dp: Allow signals to interrupt drm_aux-dev reads/writes") 3941dae15ed9 ("drm_dp_aux_dev: switch to read_iter/write_iter") 43968d7b806d ("drm: Extract drm_plane.[hc]") 522171951761 ("drm: Extract drm_connector.[hc]") 562836a269e3 ("drm/dp_mst: Enable registration of AUX devices for MST ports") 580fc13f3ee4 ("drm/dp: drmP.h include removal") 5a64967a2f3b ("drm/dp_mst: Have DP_Tx send one msg at a time") 5fff80bbdb6b ("drm/atomic: Allow for holes in connector state, v2.") 70412cfa6dde ("drm/kms_helper: Add a common place to call init and exit functions.") 96106c9729f5 ("drm: fix implicit declaration build error on ia64") 9b20fa08d3fd ("Documentation/gpu: convert the KMS properties table to CSV") a095caa7f5ec ("drm/atomic-helper: roll out commit synchronization") a4370c777406 ("drm/atomic: Make private objs proper objects") b430c27a7de3 ("drm: Add driver-private objects to atomic state") be9174a482b9 ("drm/atomic-helper: use for_each_*_in_state more") ca00c2b986ea ("Documentation/gpu: split up the gpu documentation") cb597fcea5c2 ("Documentation/gpu: add new gpu.rst converted from DocBook gpu.tmpl") e94cb37b34eb ("drm/dp: Add a drm_aux-dev module for reading/writing dpcd registers.") ede53344dbfd ("drm: Add helper for DP++ adaptors") NOTE: The patch will not be queued to stable trees until it is upstream. How should we proceed with this patch? -- Thanks Sasha ^ permalink raw reply [flat|nested] 6+ messages in thread
end of thread, other threads:[~2020-05-01 2:55 UTC | newest] Thread overview: 6+ messages (download: mbox.gz follow: Atom feed -- links below jump to the message on this page -- 2020-04-27 21:34 [PATCH 0/1] Backport "drm/dp_mst: Kill the second sideband tx slot, save the world" for drm-fixes Lyude Paul 2020-04-27 21:34 ` Lyude Paul 2020-04-27 21:34 ` [PATCH 1/1] drm/dp_mst: Kill the second sideband tx slot, save the world Lyude Paul 2020-04-27 21:34 ` Lyude Paul 2020-05-01 2:55 ` Sasha Levin 2020-05-01 2:55 ` Sasha Levin
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.