drm/dp_mst: Fix drm_dp_send_dpcd_write() return code
Subsystems (2)
PATCH 1/1 drm/dp_mst: Fix drm_dp_send_dpcd_write() return code
drm_dp_mst_wait_tx_reply() returns > 1 if time elapsed in wait_event_timeout() before check_txmsg_state(mgr, txmsg) evaluated to true. However, we make the mistake of returning this time from drm_dp_send_dpcd_write() on success instead of returning the number of bytes written - causing spontaneous failures during link probing:
[drm:drm_dp_send_link_address [drm_kms_helper]] *ERROR* GUID check on 10:01 failed: 3975
Yikes! So, fix this by returning the number of bytes written on success instead.
--- drivers/gpu/drm/drm_dp_mst_topology.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-)
drivers/gpu/drm/drm_dp_mst_topology.c +6 -2
@@ -3436,8 +3436,12 @@ static int drm_dp_send_dpcd_write(struct drm_dp_mst_topology_mgr *mgr,drm_dp_queue_down_tx (mgr, txmsg); ret =drm_dp_mst_wait_tx_reply (mstb, txmsg); -if (ret >0 && txmsg->reply.reply_type ==DP_SIDEBAND_REPLY_NAK ) - ret = -EIO ; +if (ret >0 ) { +if (txmsg->reply.reply_type ==DP_SIDEBAND_REPLY_NAK ) + ret = -EIO ; +else + ret = size; + }kfree (txmsg); fail_put:
Signature · 1 line
2.25.3
Quoted 10 lines · Lyude Paul
drm_dp_mst_wait_tx_reply()returns > 1 if time elapsed inwait_event_timeout()beforecheck_txmsg_state(mgr, txmsg)evaluated to true. However, we make the mistake of returning this time fromdrm_dp_send_dpcd_write()on success instead of returning the number of bytes written - causing spontaneous failures during link probing:[drm:drm_dp_send_link_address [
drm_kms_helper]] *ERROR* GUID check on 10:01 failed: 3975
Quoted 7 lines
Yikes! So, fix this by returning the number of bytes written on success instead.
Signed-off-by Lyude Paul <[email protected]>Fixes cb897542c6d2 ("drm/dp_mst: Fix W=1 warnings")Cc Benjamin Gaignard <[email protected]>Cc Sean Paul <[email protected]>
Quoted 26 lines
--- drivers/gpu/drm/drm_dp_mst_topology.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-)drivers/gpu/drm/drm_dp_mst_topology.c +6
-3@@ -3436,8 +3436,12 @@ static int drm_dp_send_dpcd_write(struct drm_dp_mst_topology_mgr *mgr,drm_dp_queue_down_tx (mgr, txmsg); ret =drm_dp_mst_wait_tx_reply (mstb, txmsg); -if (ret >0 && txmsg->reply.reply_type ==DP_SIDEBAND_REPLY_NAK ) - ret = -EIO ; +if (ret >0 ) { +if (txmsg->reply.reply_type ==DP_SIDEBAND_REPLY_NAK ) + ret = -EIO ; +else + ret = size; + }kfree (txmsg); fail_put: --2.25.3
Quoted 4 lines
_______________________________________________
dri-devel mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/dri-devel
_______________________________________________
dri-devel mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/dri-devel
Quoted 10 lines · Lyude Paul
drm_dp_mst_wait_tx_reply()returns > 1 if time elapsed inwait_event_timeout()beforecheck_txmsg_state(mgr, txmsg)evaluated to true. However, we make the mistake of returning this time fromdrm_dp_send_dpcd_write()on success instead of returning the number of bytes written - causing spontaneous failures during link probing:[drm:drm_dp_send_link_address [
drm_kms_helper]] *ERROR* GUID check on 10:01 failed: 3975
Quoted 7 lines
Yikes! So, fix this by returning the number of bytes written on success instead.
Signed-off-by Lyude Paul <[email protected]>Fixes cb897542c6d2 ("drm/dp_mst: Fix W=1 warnings")Cc Benjamin Gaignard <[email protected]>Cc Sean Paul <[email protected]>
Quoted 24 lines
--- drivers/gpu/drm/drm_dp_mst_topology.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-)drivers/gpu/drm/drm_dp_mst_topology.c +6
-3@@ -3436,8 +3436,12 @@ static int drm_dp_send_dpcd_write(struct drm_dp_mst_topology_mgr *mgr,drm_dp_queue_down_tx (mgr, txmsg); ret =drm_dp_mst_wait_tx_reply (mstb, txmsg); -if (ret >0 && txmsg->reply.reply_type ==DP_SIDEBAND_REPLY_NAK ) - ret = -EIO ; +if (ret >0 ) { +if (txmsg->reply.reply_type ==DP_SIDEBAND_REPLY_NAK ) + ret = -EIO ; +else + ret = size; + }kfree (txmsg); fail_put: --
Quoted 2 lines
2.25.3
_______________________________________________
dri-devel mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/dri-devel