summaryrefslogtreecommitdiffstats
path: root/drivers/gpu/drm/amd/display/dc/dce/dce_stream_encoder.c
diff options
context:
space:
mode:
authorCharlene Liu2017-11-16 00:27:31 +0100
committerAlex Deucher2017-11-28 23:55:48 +0100
commit2b7c97d687e81db07d8c67b32ff920e7bf59444e (patch)
tree0d6d4d2fadc32515c5921ef02e03ea6fefb8371e /drivers/gpu/drm/amd/display/dc/dce/dce_stream_encoder.c
parentdrm/amd/display: fix memory leaks on error exit return (diff)
downloadkernel-qcow2-linux-2b7c97d687e81db07d8c67b32ff920e7bf59444e.tar.gz
kernel-qcow2-linux-2b7c97d687e81db07d8c67b32ff920e7bf59444e.tar.xz
kernel-qcow2-linux-2b7c97d687e81db07d8c67b32ff920e7bf59444e.zip
drm/amd/display: fix seq issue: turn on clock before programming afmt.
Signed-off-by: Charlene Liu <charlene.liu@amd.com> Reviewed-by: Krunoslav Kovac <Krunoslav.Kovac@amd.com> Acked-by: Harry Wentland <harry.wentland@amd.com> Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
Diffstat (limited to 'drivers/gpu/drm/amd/display/dc/dce/dce_stream_encoder.c')
-rw-r--r--drivers/gpu/drm/amd/display/dc/dce/dce_stream_encoder.c5
1 files changed, 5 insertions, 0 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 4fd49a16c3b6..c04d67db9cea 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,6 +87,11 @@ 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*/
+ if (regval != 1)
+ REG_UPDATE(AFMT_CNTL, AFMT_AUDIO_CLOCK_EN, 1);
+
if (REG(AFMT_VBI_PACKET_CONTROL1)) {
if (packet_index >= 8)
ASSERT(0);