Attachment 83304 Details for Bug 67435 – fix

[patch] fix

0001-drm-radeon-select-audio-dto-based-on-encoder-id-for-.patch (text/plain), 1.71 KB, created by Alex Deucher on 2013-07-30 15:21:52 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Alex Deucher

Created: 2013-07-30 15:21:52 UTC

Size: 1.71 KB

patch

obsolete

>From 4210c77856df5faa32b9d4534ed1afdb09e469d3 Mon Sep 17 00:00:00 2001
>From: Alex Deucher <alexander.deucher@amd.com>
>Date: Mon, 29 Jul 2013 18:56:13 -0400
>Subject: [PATCH] drm/radeon: select audio dto based on encoder id for DCE3
>
>There are two audio dtos on radeon asics that you can
>select between.  Normally, dto0 is used for hdmi and
>dto1 for DP, but it seems that the dto is somehow
>tied to the encoders on DCE3 asics.
>
>fixes:
>https://bugs.freedesktop.org/show_bug.cgi?id=67435
>
>Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
>Cc: stable@vger.kernel.org
>---
> drivers/gpu/drm/radeon/r600_hdmi.c |   12 +++++++++---
> 1 files changed, 9 insertions(+), 3 deletions(-)
>
>diff --git a/drivers/gpu/drm/radeon/r600_hdmi.c b/drivers/gpu/drm/radeon/r600_hdmi.c
>index f48240b..b9b1139 100644
>--- a/drivers/gpu/drm/radeon/r600_hdmi.c
>+++ b/drivers/gpu/drm/radeon/r600_hdmi.c
>@@ -242,9 +242,15 @@ void r600_audio_set_dto(struct drm_encoder *encoder, u32 clock)
> 		/* according to the reg specs, this should DCE3.2 only, but in
> 		 * practice it seems to cover DCE3.0 as well.
> 		 */
>-		WREG32(DCCG_AUDIO_DTO0_PHASE, base_rate * 100);
>-		WREG32(DCCG_AUDIO_DTO0_MODULE, clock * 100);
>-		WREG32(DCCG_AUDIO_DTO_SELECT, 0); /* select DTO0 */
>+		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 */
> 		WREG32(AUDIO_DTO, AUDIO_DTO_PHASE(base_rate / 10) |
>-- 
>1.7.7.5
>

Actions: View | Splinter Review

Attachments on bug 67435: 83304

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.