drm/radeon/audio: set mute around state setup
authorAlex Deucher <alexander.deucher@amd.com>
Fri, 27 Feb 2015 15:38:40 +0000 (10:38 -0500)
committerAlex Deucher <alexander.deucher@amd.com>
Tue, 3 Mar 2015 22:28:22 +0000 (17:28 -0500)
To avoid possible sound artifacts while setting up audio.

Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
drivers/gpu/drm/radeon/radeon_audio.c

index 713949487a66ddeacc63914293f9351a6bcafa86..5b579582175b7fcc1c08948bde144162d401ec72 100644 (file)
@@ -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,