Attachment 86569 Details for Bug 69671 – possible fix

[patch] possible fix

0001-drm-radeon-fix-hdmi-audio-on-DCE3.0-3.1-asics.patch (text/plain), 2.36 KB, created by Alex Deucher on 2013-09-25 16:09:02 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Alex Deucher

Created: 2013-09-25 16:09:02 UTC

Size: 2.36 KB

patch

obsolete

>From 8d57d51bac3f44ff17816b1e5a74ddaa6f5de211 Mon Sep 17 00:00:00 2001
>From: Alex Deucher <alexander.deucher@amd.com>
>Date: Wed, 25 Sep 2013 12:04:37 -0400
>Subject: [PATCH] drm/radeon: fix hdmi audio on DCE3.0/3.1 asics
>
>These asics don't seem to use a mix of the DCE2.x and
>DCE3.2 audio interfaces despite what the register spec
>says.
>
>Fixes:
>https://bugs.freedesktop.org/show_bug.cgi?id=69729
>https://bugs.freedesktop.org/show_bug.cgi?id=69671
>
>Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
>Cc: stable@vger.kernel.org
>---
> drivers/gpu/drm/radeon/r600_hdmi.c | 20 +++++++++++++++-----
> 1 file changed, 15 insertions(+), 5 deletions(-)
>
>diff --git a/drivers/gpu/drm/radeon/r600_hdmi.c b/drivers/gpu/drm/radeon/r600_hdmi.c
>index f443010..b0fa600 100644
>--- a/drivers/gpu/drm/radeon/r600_hdmi.c
>+++ b/drivers/gpu/drm/radeon/r600_hdmi.c
>@@ -257,10 +257,7 @@ void r600_audio_set_dto(struct drm_encoder *encoder, u32 clock)
> 	 * number (coefficient of two integer numbers.  DCCG_AUDIO_DTOx_PHASE
> 	 * is the numerator, DCCG_AUDIO_DTOx_MODULE is the denominator
> 	 */
>-	if (ASIC_IS_DCE3(rdev)) {
>-		/* according to the reg specs, this should DCE3.2 only, but in
>-		 * practice it seems to cover DCE3.0 as well.
>-		 */
>+	if (ASIC_IS_DCE32(rdev)) {
> 		if (dig->dig_encoder == 0) {
> 			dto_cntl = RREG32(DCCG_AUDIO_DTO0_CNTL) & ~DCCG_AUDIO_DTO_WALLCLOCK_RATIO_MASK;
> 			dto_cntl |= DCCG_AUDIO_DTO_WALLCLOCK_RATIO(wallclock_ratio);
>@@ -276,8 +273,21 @@ void r600_audio_set_dto(struct drm_encoder *encoder, u32 clock)
> 			WREG32(DCCG_AUDIO_DTO1_MODULE, dto_modulo);
> 			WREG32(DCCG_AUDIO_DTO_SELECT, 1); /* select DTO1 */
> 		}
>+	} else if (ASIC_IS_DCE3(rdev)) {
>+		/* according to the reg specs, this should DCE3.2 only, but in
>+		 * practice it seems to cover DCE3.0/3.1 as well.
>+		 */
>+		if (dig->dig_encoder == 0) {
>+			WREG32(DCCG_AUDIO_DTO0_PHASE, base_rate * 100);
>+			WREG32(DCCG_AUDIO_DTO0_MODULE, clock * 100);
>+			WREG32(DCCG_AUDIO_DTO_SELECT, 0); /* select DTO0 */
>+		} else {
>+			WREG32(DCCG_AUDIO_DTO1_PHASE, base_rate * 100);
>+			WREG32(DCCG_AUDIO_DTO1_MODULE, clock * 100);
>+			WREG32(DCCG_AUDIO_DTO_SELECT, 1); /* select DTO1 */
>+		}
> 	} else {
>-		/* according to the reg specs, this should be DCE2.0 and DCE3.0 */
>+		/* according to the reg specs, this should be DCE2.0 and DCE3.0/3.1 */
> 		WREG32(AUDIO_DTO, AUDIO_DTO_PHASE(base_rate / 10) |
> 		       AUDIO_DTO_MODULE(clock / 10));
> 	}
>-- 
>1.8.3.1
>

Actions: View | Splinter Review

Attachments on bug 69671: 86569

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.