aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCharlene Liu <[email protected]>2017-11-15 18:27:31 -0500
committerAlex Deucher <[email protected]>2017-12-14 10:51:23 -0500
commitc984d06b7bca3b0451faa5e0c323e4ff16b365b3 (patch)
treef26c85fa65db8711b4935135f66a5d3e3ccc3b3e
parent096480eac61ca8aa1834ba7ceda165d397e29ca0 (diff)
drm/amd/display: fix seq issue: turn on clock before programming afmt.
Signed-off-by: Charlene Liu <[email protected]> Reviewed-by: Krunoslav Kovac <[email protected]> Acked-by: Harry Wentland <[email protected]> Signed-off-by: Alex Deucher <[email protected]>
-rw-r--r--drivers/gpu/drm/amd/display/dc/dce/dce_stream_encoder.c4
1 files changed, 3 insertions, 1 deletions
diff --git a/drivers/gpu/drm/amd/display/dc/dce/dce_stream_encoder.c b/drivers/gpu/drm/amd/display/dc/dce/dce_stream_encoder.c
index 83bae207371d..327a0a76266b 100644
--- a/drivers/gpu/drm/amd/display/dc/dce/dce_stream_encoder.c
+++ b/drivers/gpu/drm/amd/display/dc/dce/dce_stream_encoder.c
@@ -87,8 +87,10 @@ static void dce110_update_generic_info_packet(
*/
uint32_t max_retries = 50;
+ REG_GET(AFMT_CNTL, AFMT_AUDIO_CLOCK_EN, &regval);
/*we need turn on clock before programming AFMT block*/
- REG_UPDATE(AFMT_CNTL, AFMT_AUDIO_CLOCK_EN, 1);
+ if (regval != 1)
+ REG_UPDATE(AFMT_CNTL, AFMT_AUDIO_CLOCK_EN, 1);
if (REG(AFMT_VBI_PACKET_CONTROL1)) {
if (packet_index >= 8)