summaryrefslogtreecommitdiffstats
path: root/drivers/gpu/drm
diff options
context:
space:
mode:
authorAlex Deucher <alexander.deucher@amd.com>2015-02-27 16:38:40 +0100
committerAlex Deucher <alexander.deucher@amd.com>2015-03-03 23:28:22 +0100
commit88af339f9fe285cb93c264adc75545a3d3b50470 (patch)
tree19ed61669dc715b659cf83c78e4fd07600ec8403 /drivers/gpu/drm
parentdrm/radeon: assign pin in detect (diff)
downloadlinux-88af339f9fe285cb93c264adc75545a3d3b50470.tar.xz
linux-88af339f9fe285cb93c264adc75545a3d3b50470.zip
drm/radeon/audio: set mute around state setup
To avoid possible sound artifacts while setting up audio. Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
Diffstat (limited to 'drivers/gpu/drm')
-rw-r--r--drivers/gpu/drm/radeon/radeon_audio.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/gpu/drm/radeon/radeon_audio.c b/drivers/gpu/drm/radeon/radeon_audio.c
index 713949487a66..5b579582175b 100644
--- a/drivers/gpu/drm/radeon/radeon_audio.c
+++ b/drivers/gpu/drm/radeon/radeon_audio.c
@@ -705,13 +705,13 @@ static void radeon_audio_hdmi_mode_set(struct drm_encoder *encoder,
if (!dig || !dig->afmt)
return;
+ radeon_audio_set_mute(encoder, true);
/* disable audio prior to setting up hw */
radeon_audio_enable(rdev, dig->afmt->pin, 0);
radeon_audio_set_dto(encoder, mode->clock);
radeon_audio_set_vbi_packet(encoder);
radeon_hdmi_set_color_depth(encoder);
- radeon_audio_set_mute(encoder, false);
radeon_audio_update_acr(encoder, mode->clock);
radeon_audio_set_audio_packet(encoder);
radeon_audio_select_pin(encoder);
@@ -721,6 +721,7 @@ static void radeon_audio_hdmi_mode_set(struct drm_encoder *encoder,
/* enable audio after to setting up hw */
radeon_audio_enable(rdev, dig->afmt->pin, 0xf);
+ radeon_audio_set_mute(encoder, false);
}
static void radeon_audio_dp_mode_set(struct drm_encoder *encoder,