Attachment 42421 Details for Bug 27731 – alternate patch

[patch] alternate patch

0001-drm-radeon-kms-only-enable-HDMI-mode-if-radeon-audio.patch (text/plain), 2.04 KB, created by Alex Deucher on 2011-01-24 15:33:10 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Alex Deucher

Created: 2011-01-24 15:33:10 UTC

Size: 2.04 KB

patch

obsolete

>From 59ad271c5a5064029e17d464305b530c7993d636 Mon Sep 17 00:00:00 2001
>From: Alex Deucher <alexdeucher@gmail.com>
>Date: Mon, 24 Jan 2011 18:29:33 -0500
>Subject: [PATCH] drm/radeon/kms: only enable HDMI mode if radeon audio is enabled
>
>Force DVI mode if the user specifies radeon.audio=0.  The driver
>doesn't handle HDMI mode properly in some cases.
>
>Fixes:
>https://bugs.freedesktop.org/show_bug.cgi?id=27731
>
>Signed-off-by: Alex Deucher <alexdeucher@gmail.com>
>---
> drivers/gpu/drm/radeon/radeon_encoders.c |    6 +++---
> 1 files changed, 3 insertions(+), 3 deletions(-)
>
>diff --git a/drivers/gpu/drm/radeon/radeon_encoders.c b/drivers/gpu/drm/radeon/radeon_encoders.c
>index 8fd1842..5e90984 100644
>--- a/drivers/gpu/drm/radeon/radeon_encoders.c
>+++ b/drivers/gpu/drm/radeon/radeon_encoders.c
>@@ -641,7 +641,7 @@ atombios_get_encoder_mode(struct drm_encoder *encoder)
> 	switch (connector->connector_type) {
> 	case DRM_MODE_CONNECTOR_DVII:
> 	case DRM_MODE_CONNECTOR_HDMIB: /* HDMI-B is basically DL-DVI; analog works fine */
>-		if (drm_detect_monitor_audio(radeon_connector->edid)) {
>+		if (drm_detect_monitor_audio(radeon_connector->edid) && radeon_audio) {
> 			/* fix me */
> 			if (ASIC_IS_DCE4(rdev))
> 				return ATOM_ENCODER_MODE_DVI;
>@@ -655,7 +655,7 @@ atombios_get_encoder_mode(struct drm_encoder *encoder)
> 	case DRM_MODE_CONNECTOR_DVID:
> 	case DRM_MODE_CONNECTOR_HDMIA:
> 	default:
>-		if (drm_detect_monitor_audio(radeon_connector->edid)) {
>+		if (drm_detect_monitor_audio(radeon_connector->edid) && radeon_audio) {
> 			/* fix me */
> 			if (ASIC_IS_DCE4(rdev))
> 				return ATOM_ENCODER_MODE_DVI;
>@@ -673,7 +673,7 @@ atombios_get_encoder_mode(struct drm_encoder *encoder)
> 		if ((dig_connector->dp_sink_type == CONNECTOR_OBJECT_ID_DISPLAYPORT) ||
> 		    (dig_connector->dp_sink_type == CONNECTOR_OBJECT_ID_eDP))
> 			return ATOM_ENCODER_MODE_DP;
>-		else if (drm_detect_monitor_audio(radeon_connector->edid)) {
>+		else if (drm_detect_monitor_audio(radeon_connector->edid) && radeon_audio) {
> 			/* fix me */
> 			if (ASIC_IS_DCE4(rdev))
> 				return ATOM_ENCODER_MODE_DVI;
>-- 
>1.7.1.1
>

Actions: View | Splinter Review

Attachments on bug 27731: 35153 | 35154 | 35155 | 40237 | 40274 | 42421

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.