From bc97aaf45e3ff5ec9c9532775bae5faeb3d01a46 Mon Sep 17 00:00:00 2001 From: Andrey Grodzovsky Date: Thu, 14 Jan 2016 18:23:43 -0500 Subject: [PATCH 0696/1110] drm/amd/dal: Fix waiting on mmDP_MSE_SAT_UPDATE to correct form. Signed-off-by: Andrey Grodzovsky Acked-by: Jordan Lazare --- drivers/gpu/drm/amd/dal/dc/dce110/dce110_link_encoder.c | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/drivers/gpu/drm/amd/dal/dc/dce110/dce110_link_encoder.c b/drivers/gpu/drm/amd/dal/dc/dce110/dce110_link_encoder.c index 73ba7b8..0f0ecfe 100644 --- a/drivers/gpu/drm/amd/dal/dc/dce110/dce110_link_encoder.c +++ b/drivers/gpu/drm/amd/dal/dc/dce110/dce110_link_encoder.c @@ -1725,6 +1725,7 @@ void dce110_link_encoder_update_mst_stream_allocation_table( struct dc_context *ctx = enc110->base.ctx; uint32_t value0 = 0; uint32_t value1 = 0; + uint32_t value2 = 0; uint32_t slots = 0; uint32_t src = 0; uint32_t retries = 0; @@ -1851,10 +1852,14 @@ void dce110_link_encoder_update_mst_stream_allocation_table( value1 = get_reg_field_value( value0, DP_MSE_SAT_UPDATE, + DP_MSE_SAT_UPDATE); + value2 = get_reg_field_value( + value0, + DP_MSE_SAT_UPDATE, DP_MSE_16_MTP_KEEPOUT); /* bit field DP_MSE_SAT_UPDATE is set to 1 already */ - if (value1) + if (!value1 && !value2) break; ++retries; } while (retries < DP_MST_UPDATE_MAX_RETRY); -- 2.7.4