Attachment 87616 Details for Bug 70439 – possible fix

[patch] possible fix

0001-drm-radeon-rework-and-disable-audio-by-default.patch (text/plain), 7.63 KB, created by Alex Deucher on 2013-10-14 17:22:47 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Alex Deucher

Created: 2013-10-14 17:22:47 UTC

Size: 7.63 KB

patch

obsolete

>From 0e4e3ad5a6730c8d0ed3ef8f342fc1d395d322de Mon Sep 17 00:00:00 2001
>From: Alex Deucher <alexander.deucher@amd.com>
>Date: Mon, 14 Oct 2013 13:17:50 -0400
>Subject: [PATCH] drm/radeon: rework and disable audio by default
>
>Allowing audio to be enabled on the fly seems to
>cause hangs in some cases on certain boards.
>
>This commit reverts back to the previous behavior:
>- audio is disabled by default
>- booting with radeon.audio=1 enables audio
>
>It also retains the new feature of allowing the
>user to enable audio on the fly with xrandr, but only
>if radeon.audio=1 is set.
>
>See bug:
>https://bugs.freedesktop.org/show_bug.cgi?id=70439
>
>Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
>---
> drivers/gpu/drm/radeon/atombios_encoders.c | 52 ++++++++++++++++++++----------
> drivers/gpu/drm/radeon/radeon_connectors.c | 33 ++++++++++++-------
> drivers/gpu/drm/radeon/radeon_drv.c        |  4 +--
> 3 files changed, 58 insertions(+), 31 deletions(-)
>
>diff --git a/drivers/gpu/drm/radeon/atombios_encoders.c b/drivers/gpu/drm/radeon/atombios_encoders.c
>index 2a761f2..5e891b2 100644
>--- a/drivers/gpu/drm/radeon/atombios_encoders.c
>+++ b/drivers/gpu/drm/radeon/atombios_encoders.c
>@@ -707,24 +707,37 @@ 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 ((radeon_connector->audio == RADEON_AUDIO_ENABLE) ||
>-		    (drm_detect_hdmi_monitor(radeon_connector->edid) &&
>-		     (radeon_connector->audio == RADEON_AUDIO_AUTO)))
>-			return ATOM_ENCODER_MODE_HDMI;
>-		else if (radeon_connector->use_digital)
>+		if (radeon_audio != 0) {
>+			if (radeon_connector->use_digital &&
>+			    (radeon_connector->audio == RADEON_AUDIO_ENABLE))
>+				return ATOM_ENCODER_MODE_HDMI;
>+			else if (drm_detect_hdmi_monitor(radeon_connector->edid) &&
>+				 (radeon_connector->audio == RADEON_AUDIO_AUTO))
>+				return ATOM_ENCODER_MODE_HDMI;
>+			else if (radeon_connector->use_digital)
>+				return ATOM_ENCODER_MODE_DVI;
>+			else
>+				return ATOM_ENCODER_MODE_CRT;
>+		} else if (radeon_connector->use_digital) {
> 			return ATOM_ENCODER_MODE_DVI;
>-		else
>+		} else {
> 			return ATOM_ENCODER_MODE_CRT;
>+		}
> 		break;
> 	case DRM_MODE_CONNECTOR_DVID:
> 	case DRM_MODE_CONNECTOR_HDMIA:
> 	default:
>-		if ((radeon_connector->audio == RADEON_AUDIO_ENABLE) ||
>-		    (drm_detect_hdmi_monitor(radeon_connector->edid) &&
>-		     (radeon_connector->audio == RADEON_AUDIO_AUTO)))
>-			return ATOM_ENCODER_MODE_HDMI;
>-		else
>+		if (radeon_audio != 0) {
>+			if (radeon_connector->audio == RADEON_AUDIO_ENABLE)
>+				return ATOM_ENCODER_MODE_HDMI;
>+			else if (drm_detect_hdmi_monitor(radeon_connector->edid) &&
>+				 (radeon_connector->audio == RADEON_AUDIO_AUTO))
>+				return ATOM_ENCODER_MODE_HDMI;
>+			else
>+				return ATOM_ENCODER_MODE_DVI;
>+		} else {
> 			return ATOM_ENCODER_MODE_DVI;
>+		}
> 		break;
> 	case DRM_MODE_CONNECTOR_LVDS:
> 		return ATOM_ENCODER_MODE_LVDS;
>@@ -732,14 +745,19 @@ atombios_get_encoder_mode(struct drm_encoder *encoder)
> 	case DRM_MODE_CONNECTOR_DisplayPort:
> 		dig_connector = radeon_connector->con_priv;
> 		if ((dig_connector->dp_sink_type == CONNECTOR_OBJECT_ID_DISPLAYPORT) ||
>-		    (dig_connector->dp_sink_type == CONNECTOR_OBJECT_ID_eDP))
>+		    (dig_connector->dp_sink_type == CONNECTOR_OBJECT_ID_eDP)) {
> 			return ATOM_ENCODER_MODE_DP;
>-		else if ((radeon_connector->audio == RADEON_AUDIO_ENABLE) ||
>-			 (drm_detect_hdmi_monitor(radeon_connector->edid) &&
>-			  (radeon_connector->audio == RADEON_AUDIO_AUTO)))
>-			return ATOM_ENCODER_MODE_HDMI;
>-		else
>+		} else if (radeon_audio != 0) {
>+			if (radeon_connector->audio == RADEON_AUDIO_ENABLE)
>+				return ATOM_ENCODER_MODE_HDMI;
>+			else if (drm_detect_hdmi_monitor(radeon_connector->edid) &&
>+				 (radeon_connector->audio == RADEON_AUDIO_AUTO))
>+				return ATOM_ENCODER_MODE_HDMI;
>+			else
>+				return ATOM_ENCODER_MODE_DVI;
>+		} else {
> 			return ATOM_ENCODER_MODE_DVI;
>+		}
> 		break;
> 	case DRM_MODE_CONNECTOR_eDP:
> 		return ATOM_ENCODER_MODE_DP;
>diff --git a/drivers/gpu/drm/radeon/radeon_connectors.c b/drivers/gpu/drm/radeon/radeon_connectors.c
>index 79159b5..6456573 100644
>--- a/drivers/gpu/drm/radeon/radeon_connectors.c
>+++ b/drivers/gpu/drm/radeon/radeon_connectors.c
>@@ -1658,9 +1658,12 @@ radeon_add_atom_connector(struct drm_device *dev,
> 			drm_object_attach_property(&radeon_connector->base.base,
> 						      rdev->mode_info.underscan_vborder_property,
> 						      0);
>-			drm_object_attach_property(&radeon_connector->base.base,
>-						   rdev->mode_info.audio_property,
>-						   RADEON_AUDIO_DISABLE);
>+			if (radeon_audio != 0)
>+				drm_object_attach_property(&radeon_connector->base.base,
>+							   rdev->mode_info.audio_property,
>+							   (radeon_audio == 1) ?
>+							   RADEON_AUDIO_AUTO :
>+							   RADEON_AUDIO_DISABLE);
> 			subpixel_order = SubPixelHorizontalRGB;
> 			connector->interlace_allowed = true;
> 			if (connector_type == DRM_MODE_CONNECTOR_HDMIB)
>@@ -1754,10 +1757,12 @@ radeon_add_atom_connector(struct drm_device *dev,
> 							      rdev->mode_info.underscan_vborder_property,
> 							      0);
> 			}
>-			if (ASIC_IS_DCE2(rdev)) {
>+			if (ASIC_IS_DCE2(rdev) && (radeon_audio != 0)) {
> 				drm_object_attach_property(&radeon_connector->base.base,
>-							      rdev->mode_info.audio_property,
>-							      RADEON_AUDIO_DISABLE);
>+							   rdev->mode_info.audio_property,
>+							   (radeon_audio == 1) ?
>+							   RADEON_AUDIO_AUTO :
>+							   RADEON_AUDIO_DISABLE);
> 			}
> 			if (connector_type == DRM_MODE_CONNECTOR_DVII) {
> 				radeon_connector->dac_load_detect = true;
>@@ -1799,10 +1804,12 @@ radeon_add_atom_connector(struct drm_device *dev,
> 							      rdev->mode_info.underscan_vborder_property,
> 							      0);
> 			}
>-			if (ASIC_IS_DCE2(rdev)) {
>+			if (ASIC_IS_DCE2(rdev) && (radeon_audio != 0)) {
> 				drm_object_attach_property(&radeon_connector->base.base,
>-							      rdev->mode_info.audio_property,
>-							      RADEON_AUDIO_DISABLE);
>+							   rdev->mode_info.audio_property,
>+							   (radeon_audio == 1) ?
>+							   RADEON_AUDIO_AUTO :
>+							   RADEON_AUDIO_DISABLE);
> 			}
> 			subpixel_order = SubPixelHorizontalRGB;
> 			connector->interlace_allowed = true;
>@@ -1843,10 +1850,12 @@ radeon_add_atom_connector(struct drm_device *dev,
> 							      rdev->mode_info.underscan_vborder_property,
> 							      0);
> 			}
>-			if (ASIC_IS_DCE2(rdev)) {
>+			if (ASIC_IS_DCE2(rdev) && (radeon_audio != 0)) {
> 				drm_object_attach_property(&radeon_connector->base.base,
>-							      rdev->mode_info.audio_property,
>-							      RADEON_AUDIO_DISABLE);
>+							   rdev->mode_info.audio_property,
>+							   (radeon_audio == 1) ?
>+							   RADEON_AUDIO_AUTO :
>+							   RADEON_AUDIO_DISABLE);
> 			}
> 			connector->interlace_allowed = true;
> 			/* in theory with a DP to VGA converter... */
>diff --git a/drivers/gpu/drm/radeon/radeon_drv.c b/drivers/gpu/drm/radeon/radeon_drv.c
>index cdd12dc..f298194 100644
>--- a/drivers/gpu/drm/radeon/radeon_drv.c
>+++ b/drivers/gpu/drm/radeon/radeon_drv.c
>@@ -153,7 +153,7 @@ int radeon_benchmarking = 0;
> int radeon_testing = 0;
> int radeon_connector_table = 0;
> int radeon_tv = 1;
>-int radeon_audio = 1;
>+int radeon_audio = 0;
> int radeon_disp_priority = 0;
> int radeon_hw_i2c = 0;
> int radeon_pcie_gen2 = -1;
>@@ -196,7 +196,7 @@ module_param_named(connector_table, radeon_connector_table, int, 0444);
> MODULE_PARM_DESC(tv, "TV enable (0 = disable)");
> module_param_named(tv, radeon_tv, int, 0444);
> 
>-MODULE_PARM_DESC(audio, "Audio enable (1 = enable)");
>+MODULE_PARM_DESC(audio, "Audio enable (-1 = auto, 0 = disable, 1 = enable)");
> module_param_named(audio, radeon_audio, int, 0444);
> 
> MODULE_PARM_DESC(disp_priority, "Display Priority (0 = auto, 1 = normal, 2 = high)");
>-- 
>1.8.3.1
>

Actions: View | Splinter Review

Attachments on bug 70439: 87590 | 87591 | 87593 | 87594 | 87616 | 87633 | 87798

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.