Attachment 113875 Details for Bug 89327 – patch 4/5

[patch] patch 4/5

0004-drm-radeon-don-t-toggle-audio-state-in-modeset.patch (text/plain), 2.37 KB, created by Alex Deucher on 2015-02-27 16:15:54 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Alex Deucher

Created: 2015-02-27 16:15:54 UTC

Size: 2.37 KB

patch

obsolete

>From 2e06d198b3c5681d9e7c2a7e365f9f7d1f72fcc3 Mon Sep 17 00:00:00 2001
>From: Alex Deucher <alexander.deucher@amd.com>
>Date: Fri, 27 Feb 2015 10:42:21 -0500
>Subject: [PATCH 4/5] drm/radeon: don't toggle audio state in modeset
>
>Should be done only at detect time to avoid spurious
>state changes on the audio side.
>
>Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
>---
> drivers/gpu/drm/radeon/radeon_audio.c | 13 +------------
> 1 file changed, 1 insertion(+), 12 deletions(-)
>
>diff --git a/drivers/gpu/drm/radeon/radeon_audio.c b/drivers/gpu/drm/radeon/radeon_audio.c
>index 5b57958..c161919 100644
>--- a/drivers/gpu/drm/radeon/radeon_audio.c
>+++ b/drivers/gpu/drm/radeon/radeon_audio.c
>@@ -696,9 +696,8 @@ static void radeon_audio_set_mute(struct drm_encoder *encoder, bool mute)
>  * update the info frames with the data from the current display mode
>  */
> static void radeon_audio_hdmi_mode_set(struct drm_encoder *encoder,
>-	struct drm_display_mode *mode)
>+				       struct drm_display_mode *mode)
> {
>-	struct radeon_device *rdev = encoder->dev->dev_private;
> 	struct radeon_encoder *radeon_encoder = to_radeon_encoder(encoder);
> 	struct radeon_encoder_atom_dig *dig = radeon_encoder->enc_priv;
> 
>@@ -706,8 +705,6 @@ static void radeon_audio_hdmi_mode_set(struct drm_encoder *encoder,
> 		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);
>@@ -719,8 +716,6 @@ static void radeon_audio_hdmi_mode_set(struct drm_encoder *encoder,
> 	if (radeon_audio_set_avi_packet(encoder, mode) < 0)
> 		return;
> 
>-	/* enable audio after to setting up hw */
>-	radeon_audio_enable(rdev, dig->afmt->pin, 0xf);
> 	radeon_audio_set_mute(encoder, false);
> }
> 
>@@ -735,18 +730,12 @@ static void radeon_audio_dp_mode_set(struct drm_encoder *encoder,
> 	if (!dig || !dig->afmt)
> 		return;
> 
>-	/* disable audio prior to setting up hw */
>-	radeon_audio_enable(rdev, dig->afmt->pin, 0);
>-
> 	radeon_audio_set_dto(encoder, rdev->clock.default_dispclk * 10);
> 	radeon_audio_set_audio_packet(encoder);
> 	radeon_audio_select_pin(encoder);
> 
> 	if (radeon_audio_set_avi_packet(encoder, mode) < 0)
> 		return;
>-
>-	/* enable audio after to setting up hw */
>-	radeon_audio_enable(rdev, dig->afmt->pin, 0xf);
> }
> 
> void radeon_audio_mode_set(struct drm_encoder *encoder,
>-- 
>1.8.3.1
>

Actions: View | Splinter Review

Attachments on bug 89327: 113830 | 113831 | 113833 | 113834 | 113872 | 113873 | 113874 | 113875 | 113876

Use of freedesktop.org services, including Bugzilla, is subject to our Code of Conduct. How we collect and use information is described in our Privacy Policy.