Skip to content

Commit 5656267

Browse files
Peichen Huanggregkh
authored andcommitted
drm/amd/display: skip CLEAR_PAYLOAD_ID_TABLE if device mst_en is 0
commit a1c9a1e upstream. [Why] Some dock and mst monitor don't like to receive CLEAR_PAYLOAD_ID_TABLE when mst_en is set to 0. It doesn't make sense to do so in source side, either. [How] Don't send CLEAR_PAYLOAD_ID_TABLE if mst_en is 0 Reviewed-by: George Shen <George.Shen@amd.com> Acked-by: Qingqing Zhuo <qingqing.zhuo@amd.com> Signed-off-by: Peichen Huang <PeiChen.Huang@amd.com> Tested-by: Daniel Wheeler <daniel.wheeler@amd.com> Signed-off-by: Alex Deucher <alexander.deucher@amd.com> [ 6.1.y doesn't have the file rename from 5461888 ("drm/amd/display: break down dc_link.c") ] Signed-off-by: Mario Limonciello <mario.limonciello@amd.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
1 parent 63eeb50 commit 5656267

File tree

1 file changed

+4
-1
lines changed

1 file changed

+4
-1
lines changed

drivers/gpu/drm/amd/display/dc/core/dc_link.c

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2092,6 +2092,7 @@ static enum dc_status enable_link_dp_mst(
20922092
struct pipe_ctx *pipe_ctx)
20932093
{
20942094
struct dc_link *link = pipe_ctx->stream->link;
2095+
unsigned char mstm_cntl;
20952096

20962097
/* sink signal type after MST branch is MST. Multiple MST sinks
20972098
* share one link. Link DP PHY is enable or training only once.
@@ -2100,7 +2101,9 @@ static enum dc_status enable_link_dp_mst(
21002101
return DC_OK;
21012102

21022103
/* clear payload table */
2103-
dm_helpers_dp_mst_clear_payload_allocation_table(link->ctx, link);
2104+
core_link_read_dpcd(link, DP_MSTM_CTRL, &mstm_cntl, 1);
2105+
if (mstm_cntl & DP_MST_EN)
2106+
dm_helpers_dp_mst_clear_payload_allocation_table(link->ctx, link);
21042107

21052108
/* to make sure the pending down rep can be processed
21062109
* before enabling the link

0 commit comments

Comments
 (0)