diff options
author | Thorsten Leemhuis <fedora@leemhuis.info> | 2020-07-01 17:07:26 +0200 |
---|---|---|
committer | Thorsten Leemhuis <fedora@leemhuis.info> | 2020-07-01 17:07:26 +0200 |
commit | b24805024693adae5ceec06aace40e57d9029fd9 (patch) | |
tree | 29236f8e81188d1940b231351a3b4ec7e928871e /drm-dp_mst-Fix-drm_dp_send_dpcd_write-return-code.patch | |
parent | 4f9aef74d72cad34127c11c93531f94f8dc665d4 (diff) | |
parent | 59aac79c260b00b5caad750024ad7421fa658702 (diff) | |
download | kernel-b24805024693adae5ceec06aace40e57d9029fd9.tar.gz kernel-b24805024693adae5ceec06aace40e57d9029fd9.tar.xz kernel-b24805024693adae5ceec06aace40e57d9029fd9.zip |
merge origin (rebase to 5.7)kernel-5.7.7-150.vanilla.knurd.1.fc31
Diffstat (limited to 'drm-dp_mst-Fix-drm_dp_send_dpcd_write-return-code.patch')
-rw-r--r-- | drm-dp_mst-Fix-drm_dp_send_dpcd_write-return-code.patch | 47 |
1 files changed, 0 insertions, 47 deletions
diff --git a/drm-dp_mst-Fix-drm_dp_send_dpcd_write-return-code.patch b/drm-dp_mst-Fix-drm_dp_send_dpcd_write-return-code.patch deleted file mode 100644 index d5b7f003f..000000000 --- a/drm-dp_mst-Fix-drm_dp_send_dpcd_write-return-code.patch +++ /dev/null @@ -1,47 +0,0 @@ -From: Lyude Paul <lyude@redhat.com> -Date: Fri, 24 Apr 2020 15:07:22 -0400 -Subject: 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. - -Signed-off-by: Lyude Paul <lyude@redhat.com> -Fixes: cb897542c6d2 ("drm/dp_mst: Fix W=1 warnings") -Cc: Benjamin Gaignard <benjamin.gaignard@st.com> -Cc: Sean Paul <sean@poorly.run> -Acked-by: Alex Deucher <alexander.deucher@amd.com> -Reviewed-by: Sean Paul <sean@poorly.run> -Link: https://patchwork.freedesktop.org/patch/msgid/20200424190722.775284-1-lyude@redhat.com ---- - drivers/gpu/drm/drm_dp_mst_topology.c | 8 ++++++-- - 1 file changed, 6 insertions(+), 2 deletions(-) - - -diff --git a/drivers/gpu/drm/drm_dp_mst_topology.c b/drivers/gpu/drm/drm_dp_mst_topology.c -index 03a1496f6120..21dc78cb4ba6 100644 ---- a/drivers/gpu/drm/drm_dp_mst_topology.c -+++ b/drivers/gpu/drm/drm_dp_mst_topology.c -@@ -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: |