summaryrefslogtreecommitdiffstats
path: root/drivers/gpu
diff options
context:
space:
mode:
authorRoman Li <Roman.Li@amd.com>2018-05-17 18:08:54 -0400
committerAlex Deucher <alexander.deucher@amd.com>2018-05-29 13:24:13 -0500
commit9356badb2636b0afe2b34a8133ab246547cdf9ca (patch)
tree1f382c4c2029297a84df58a6e3eeda871012b04e /drivers/gpu
parentfb5fb63aa91aa7b353e3f7f0031299760f65ecf2 (diff)
downloadlinux-stable-9356badb2636b0afe2b34a8133ab246547cdf9ca.tar.gz
linux-stable-9356badb2636b0afe2b34a8133ab246547cdf9ca.tar.bz2
linux-stable-9356badb2636b0afe2b34a8133ab246547cdf9ca.zip
drm/amd/display: check if audio clk enable is applicable
Fixing warning on dce10 with HDMI display. Signed-off-by: Roman Li <Roman.Li@amd.com> Reviewed-by: Charlene Liu <Charlene.Liu@amd.com> Reviewed-by: Harry Wentland <Harry.Wentland@amd.com> Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
Diffstat (limited to 'drivers/gpu')
-rw-r--r--drivers/gpu/drm/amd/display/dc/dce/dce_stream_encoder.c3
1 files changed, 2 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 c0631756cd89..c0e813c7ddd4 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
@@ -720,7 +720,8 @@ static void dce110_stream_encoder_update_hdmi_info_packets(
const uint32_t *content =
(const uint32_t *) &info_frame->avi.sb[0];
/*we need turn on clock before programming AFMT block*/
- REG_UPDATE(AFMT_CNTL, AFMT_AUDIO_CLOCK_EN, 1);
+ if (REG(AFMT_CNTL))
+ REG_UPDATE(AFMT_CNTL, AFMT_AUDIO_CLOCK_EN, 1);
REG_WRITE(AFMT_AVI_INFO0, content[0]);