Attachment 116160 Details for Bug 90777 – Patch to revert commit against 4.1-rc5

Patch to revert commit against 4.1-rc5

0001-Revert-radeon-audio-removed-unnecessary-CRC-control-.patch (text/plain), 1.64 KB, created by James Le Cuirot on 2015-05-29 22:09:58 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: James Le Cuirot

Created: 2015-05-29 22:09:58 UTC

Size: 1.64 KB

patch

obsolete

>From ced5d34cbaa66751d27161a1e4db49cc172f2cdf Mon Sep 17 00:00:00 2001
>From: James Le Cuirot <chewi@gentoo.org>
>Date: Fri, 29 May 2015 22:25:42 +0100
>Subject: [PATCH] Revert "radeon/audio: removed unnecessary CRC control
> programing"
>
>This reverts commit 8ffea8570d5a7e9dd3c10349ebc3bd79487ae30b.
>---
> drivers/gpu/drm/radeon/dce3_1_afmt.c    | 2 ++
> drivers/gpu/drm/radeon/evergreen_hdmi.c | 2 ++
> 2 files changed, 4 insertions(+)
>
>diff --git a/drivers/gpu/drm/radeon/dce3_1_afmt.c b/drivers/gpu/drm/radeon/dce3_1_afmt.c
>index f042051..d16ac0a 100644
>--- a/drivers/gpu/drm/radeon/dce3_1_afmt.c
>+++ b/drivers/gpu/drm/radeon/dce3_1_afmt.c
>@@ -204,6 +204,8 @@ void dce3_2_set_audio_packet(struct drm_encoder *encoder, u32 offset)
> 	struct drm_device *dev = encoder->dev;
> 	struct radeon_device *rdev = dev->dev_private;
> 
>+	WREG32(HDMI0_AUDIO_CRC_CONTROL + offset, 0x1000);
>+
> 	WREG32(HDMI0_AUDIO_PACKET_CONTROL + offset,
> 		HDMI0_AUDIO_DELAY_EN(1) |			/* default audio delay */
> 		HDMI0_AUDIO_PACKETS_PER_LINE(3));	/* should be suffient for all audio modes and small enough for all hblanks */
>diff --git a/drivers/gpu/drm/radeon/evergreen_hdmi.c b/drivers/gpu/drm/radeon/evergreen_hdmi.c
>index 0926739..aaabfc5 100644
>--- a/drivers/gpu/drm/radeon/evergreen_hdmi.c
>+++ b/drivers/gpu/drm/radeon/evergreen_hdmi.c
>@@ -346,6 +346,8 @@ void dce4_set_audio_packet(struct drm_encoder *encoder, u32 offset)
> 	struct drm_device *dev = encoder->dev;
> 	struct radeon_device *rdev = dev->dev_private;
> 
>+	WREG32(AFMT_AUDIO_CRC_CONTROL + offset, 0x1000);
>+
> 	WREG32(AFMT_INFOFRAME_CONTROL0 + offset,
> 		AFMT_AUDIO_INFO_UPDATE); /* required for audio info values to be updated */
> 
>-- 
>2.3.3
>

Actions: View

Attachments on bug 90777: 116160 | 116221

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.