Attachment 117316 Details for Bug 91041 – possible fix

[patch] possible fix

0001-drm-radeon-rework-audio-detect.patch (text/plain), 3.08 KB, created by Alex Deucher on 2015-07-23 14:31:55 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Alex Deucher

Created: 2015-07-23 14:31:55 UTC

Size: 3.08 KB

patch

obsolete

>From 5322bffb804500512dfba17f3233d5bf6e2ab5a8 Mon Sep 17 00:00:00 2001
>From: Alex Deucher <alexander.deucher@amd.com>
>Date: Thu, 23 Jul 2015 10:01:09 -0400
>Subject: [PATCH] drm/radeon: rework audio detect
>
>1. Always assign audio function pointers even if the display does
>not support audio.  We need to properly disable the audio stream
>when when using a non-audio capable monitor.  Fixes purple line
>on some hdmi monitors.
>
>2. Check if a pin is in use by another encoder before disabling
>it.
>
>bugs:
>https://bugzilla.kernel.org/show_bug.cgi?id=93701
>https://bugzilla.redhat.com/show_bug.cgi?id=1236337
>https://bugs.freedesktop.org/show_bug.cgi?id=91041
>
>Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
>Cc: stable@vger.kernel.org
>---
> drivers/gpu/drm/radeon/radeon_audio.c | 41 +++++++++++++++++++++++++++++------
> 1 file changed, 34 insertions(+), 7 deletions(-)
>
>diff --git a/drivers/gpu/drm/radeon/radeon_audio.c b/drivers/gpu/drm/radeon/radeon_audio.c
>index fa719c5..0e3da25 100644
>--- a/drivers/gpu/drm/radeon/radeon_audio.c
>+++ b/drivers/gpu/drm/radeon/radeon_audio.c
>@@ -245,6 +245,26 @@ static struct radeon_audio_funcs dce6_dp_funcs = {
> static void radeon_audio_enable(struct radeon_device *rdev,
> 				struct r600_audio_pin *pin, u8 enable_mask)
> {
>+	struct drm_encoder *encoder;
>+	struct radeon_encoder *radeon_encoder;
>+	struct radeon_encoder_atom_dig *dig;
>+	int pin_count = 0;
>+
>+	if (!pin)
>+		return;
>+
>+	list_for_each_entry(encoder, &rdev->ddev->mode_config.encoder_list, head) {
>+		if (radeon_encoder_is_digital(encoder)) {
>+			radeon_encoder = to_radeon_encoder(encoder);
>+			dig = radeon_encoder->enc_priv;
>+			if (dig->afmt->pin == pin)
>+				pin_count++;
>+		}
>+	}
>+
>+	if ((pin_count > 1) && (enable_mask == 0))
>+		return;
>+
> 	if (rdev->audio.funcs->enable)
> 		rdev->audio.funcs->enable(rdev, pin, enable_mask);
> }
>@@ -465,15 +485,16 @@ void radeon_audio_detect(struct drm_connector *connector,
> 	if (!radeon_audio_chipset_supported(rdev))
> 		return;
> 
>+	if (!connector->encoder)
>+		return;
>+
>+	if (!radeon_encoder_is_digital(connector->encoder))
>+		return;
>+
> 	radeon_encoder = to_radeon_encoder(connector->encoder);
> 	dig = radeon_encoder->enc_priv;
> 
> 	if (status == connector_status_connected) {
>-		if (!drm_detect_monitor_audio(radeon_connector_edid(connector))) {
>-			radeon_encoder->audio = NULL;
>-			return;
>-		}
>-
> 		if (connector->connector_type == DRM_MODE_CONNECTOR_DisplayPort) {
> 			struct radeon_connector *radeon_connector = to_radeon_connector(connector);
> 
>@@ -486,8 +507,14 @@ void radeon_audio_detect(struct drm_connector *connector,
> 			radeon_encoder->audio = rdev->audio.hdmi_funcs;
> 		}
> 
>-		dig->afmt->pin = radeon_audio_get_pin(connector->encoder);
>-		radeon_audio_enable(rdev, dig->afmt->pin, 0xf);
>+		if (drm_detect_monitor_audio(radeon_connector_edid(connector))) {
>+			if (!dig->afmt->pin)
>+				dig->afmt->pin = radeon_audio_get_pin(connector->encoder);
>+			radeon_audio_enable(rdev, dig->afmt->pin, 0xf);
>+		} else {
>+			radeon_audio_enable(rdev, dig->afmt->pin, 0);
>+			dig->afmt->pin = NULL;
>+		}
> 	} else {
> 		radeon_audio_enable(rdev, dig->afmt->pin, 0);
> 		dig->afmt->pin = NULL;
>-- 
>1.8.3.1
>

Actions: View | Splinter Review

Attachments on bug 91041: 116716 | 116717 | 117316 | 117322 | 117326 | 117395

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.