Attachment 117322 Details for Bug 91041 – possible fix

[patch] possible fix

0001-drm-radeon-rework-audio-detect-v2.patch (text/plain), 12.21 KB, created by Alex Deucher on 2015-07-23 19:04:11 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Alex Deucher

Created: 2015-07-23 19:04:11 UTC

Size: 12.21 KB

patch

obsolete

>From b35d82607d3cc17375d4c73afc4160129b45c3fa 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 (v2)
>
>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.
>
>v2: make sure we've fetched the edid before checking audio and
>    look up the encoder before calling audio_detect since
>    connector->encoder may not be assigned yet.  Separate
>    pin and afmt.  They are allocated at different times and
>    have no dependency on eachother.
>
>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/dce6_afmt.c         | 62 ++++++++++++++----------------
> drivers/gpu/drm/radeon/radeon_audio.c      | 54 ++++++++++++++++++--------
> drivers/gpu/drm/radeon/radeon_audio.h      |  3 +-
> drivers/gpu/drm/radeon/radeon_connectors.c | 18 +++++++--
> drivers/gpu/drm/radeon/radeon_mode.h       |  2 +-
> 5 files changed, 83 insertions(+), 56 deletions(-)
>
>diff --git a/drivers/gpu/drm/radeon/dce6_afmt.c b/drivers/gpu/drm/radeon/dce6_afmt.c
>index 68fd9fc..70b8e8e 100644
>--- a/drivers/gpu/drm/radeon/dce6_afmt.c
>+++ b/drivers/gpu/drm/radeon/dce6_afmt.c
>@@ -93,30 +93,26 @@ void dce6_afmt_select_pin(struct drm_encoder *encoder)
> 	struct radeon_device *rdev = encoder->dev->dev_private;
> 	struct radeon_encoder *radeon_encoder = to_radeon_encoder(encoder);
> 	struct radeon_encoder_atom_dig *dig = radeon_encoder->enc_priv;
>-	u32 offset;
> 
>-	if (!dig || !dig->afmt || !dig->afmt->pin)
>+	if (!dig || !dig->afmt || !dig->pin)
> 		return;
> 
>-	offset = dig->afmt->offset;
>-
>-	WREG32(AFMT_AUDIO_SRC_CONTROL + offset,
>-	       AFMT_AUDIO_SRC_SELECT(dig->afmt->pin->id));
>+	WREG32(AFMT_AUDIO_SRC_CONTROL +  dig->afmt->offset,
>+	       AFMT_AUDIO_SRC_SELECT(dig->pin->id));
> }
> 
> void dce6_afmt_write_latency_fields(struct drm_encoder *encoder,
>-		struct drm_connector *connector, struct drm_display_mode *mode)
>+				    struct drm_connector *connector,
>+				    struct drm_display_mode *mode)
> {
> 	struct radeon_device *rdev = encoder->dev->dev_private;
> 	struct radeon_encoder *radeon_encoder = to_radeon_encoder(encoder);
> 	struct radeon_encoder_atom_dig *dig = radeon_encoder->enc_priv;
>-	u32 tmp = 0, offset;
>+	u32 tmp = 0;
> 
>-	if (!dig || !dig->afmt || !dig->afmt->pin)
>+	if (!dig || !dig->afmt)
> 		return;
> 
>-	offset = dig->afmt->pin->offset;
>-
> 	if (mode->flags & DRM_MODE_FLAG_INTERLACE) {
> 		if (connector->latency_present[1])
> 			tmp = VIDEO_LIPSYNC(connector->video_latency[1]) |
>@@ -130,24 +126,24 @@ void dce6_afmt_write_latency_fields(struct drm_encoder *encoder,
> 		else
> 			tmp = VIDEO_LIPSYNC(0) | AUDIO_LIPSYNC(0);
> 	}
>-	WREG32_ENDPOINT(offset, AZ_F0_CODEC_PIN_CONTROL_RESPONSE_LIPSYNC, tmp);
>+	WREG32_ENDPOINT(dig->pin->offset,
>+			AZ_F0_CODEC_PIN_CONTROL_RESPONSE_LIPSYNC, tmp);
> }
> 
> void dce6_afmt_hdmi_write_speaker_allocation(struct drm_encoder *encoder,
>-	u8 *sadb, int sad_count)
>+					     u8 *sadb, int sad_count)
> {
> 	struct radeon_device *rdev = encoder->dev->dev_private;
> 	struct radeon_encoder *radeon_encoder = to_radeon_encoder(encoder);
> 	struct radeon_encoder_atom_dig *dig = radeon_encoder->enc_priv;
>-	u32 offset, tmp;
>+	u32 tmp;
> 
>-	if (!dig || !dig->afmt || !dig->afmt->pin)
>+	if (!dig || !dig->afmt || !dig->pin)
> 		return;
> 
>-	offset = dig->afmt->pin->offset;
>-
> 	/* program the speaker allocation */
>-	tmp = RREG32_ENDPOINT(offset, AZ_F0_CODEC_PIN_CONTROL_CHANNEL_SPEAKER);
>+	tmp = RREG32_ENDPOINT(dig->pin->offset,
>+			      AZ_F0_CODEC_PIN_CONTROL_CHANNEL_SPEAKER);
> 	tmp &= ~(DP_CONNECTION | SPEAKER_ALLOCATION_MASK);
> 	/* set HDMI mode */
> 	tmp |= HDMI_CONNECTION;
>@@ -155,24 +151,24 @@ void dce6_afmt_hdmi_write_speaker_allocation(struct drm_encoder *encoder,
> 		tmp |= SPEAKER_ALLOCATION(sadb[0]);
> 	else
> 		tmp |= SPEAKER_ALLOCATION(5); /* stereo */
>-	WREG32_ENDPOINT(offset, AZ_F0_CODEC_PIN_CONTROL_CHANNEL_SPEAKER, tmp);
>+	WREG32_ENDPOINT(dig->pin->offset,
>+			AZ_F0_CODEC_PIN_CONTROL_CHANNEL_SPEAKER, tmp);
> }
> 
> void dce6_afmt_dp_write_speaker_allocation(struct drm_encoder *encoder,
>-	u8 *sadb, int sad_count)
>+					   u8 *sadb, int sad_count)
> {
> 	struct radeon_device *rdev = encoder->dev->dev_private;
> 	struct radeon_encoder *radeon_encoder = to_radeon_encoder(encoder);
> 	struct radeon_encoder_atom_dig *dig = radeon_encoder->enc_priv;
>-	u32 offset, tmp;
>+	u32 tmp;
> 
>-	if (!dig || !dig->afmt || !dig->afmt->pin)
>+	if (!dig || !dig->afmt || !dig->pin)
> 		return;
> 
>-	offset = dig->afmt->pin->offset;
>-
> 	/* program the speaker allocation */
>-	tmp = RREG32_ENDPOINT(offset, AZ_F0_CODEC_PIN_CONTROL_CHANNEL_SPEAKER);
>+	tmp = RREG32_ENDPOINT(dig->pin->offset,
>+			      AZ_F0_CODEC_PIN_CONTROL_CHANNEL_SPEAKER);
> 	tmp &= ~(HDMI_CONNECTION | SPEAKER_ALLOCATION_MASK);
> 	/* set DP mode */
> 	tmp |= DP_CONNECTION;
>@@ -180,13 +176,13 @@ void dce6_afmt_dp_write_speaker_allocation(struct drm_encoder *encoder,
> 		tmp |= SPEAKER_ALLOCATION(sadb[0]);
> 	else
> 		tmp |= SPEAKER_ALLOCATION(5); /* stereo */
>-	WREG32_ENDPOINT(offset, AZ_F0_CODEC_PIN_CONTROL_CHANNEL_SPEAKER, tmp);
>+	WREG32_ENDPOINT(dig->pin->offset,
>+			AZ_F0_CODEC_PIN_CONTROL_CHANNEL_SPEAKER, tmp);
> }
> 
> void dce6_afmt_write_sad_regs(struct drm_encoder *encoder,
>-	struct cea_sad *sads, int sad_count)
>+			      struct cea_sad *sads, int sad_count)
> {
>-	u32 offset;
> 	int i;
> 	struct radeon_encoder *radeon_encoder = to_radeon_encoder(encoder);
> 	struct radeon_encoder_atom_dig *dig = radeon_encoder->enc_priv;
>@@ -206,11 +202,9 @@ void dce6_afmt_write_sad_regs(struct drm_encoder *encoder,
> 		{ AZ_F0_CODEC_PIN_CONTROL_AUDIO_DESCRIPTOR13, HDMI_AUDIO_CODING_TYPE_WMA_PRO },
> 	};
> 
>-	if (!dig || !dig->afmt || !dig->afmt->pin)
>+	if (!dig || !dig->afmt || !dig->pin)
> 		return;
> 
>-	offset = dig->afmt->pin->offset;
>-
> 	for (i = 0; i < ARRAY_SIZE(eld_reg_to_type); i++) {
> 		u32 value = 0;
> 		u8 stereo_freqs = 0;
>@@ -237,7 +231,7 @@ void dce6_afmt_write_sad_regs(struct drm_encoder *encoder,
> 
> 		value |= SUPPORTED_FREQUENCIES_STEREO(stereo_freqs);
> 
>-		WREG32_ENDPOINT(offset, eld_reg_to_type[i][0], value);
>+		WREG32_ENDPOINT(dig->pin->offset, eld_reg_to_type[i][0], value);
> 	}
> }
> 
>@@ -253,7 +247,7 @@ void dce6_audio_enable(struct radeon_device *rdev,
> }
> 
> void dce6_hdmi_audio_set_dto(struct radeon_device *rdev,
>-	struct radeon_crtc *crtc, unsigned int clock)
>+			     struct radeon_crtc *crtc, unsigned int clock)
> {
> 	/* Two dtos; generally use dto0 for HDMI */
> 	u32 value = 0;
>@@ -272,7 +266,7 @@ void dce6_hdmi_audio_set_dto(struct radeon_device *rdev,
> }
> 
> void dce6_dp_audio_set_dto(struct radeon_device *rdev,
>-	struct radeon_crtc *crtc, unsigned int clock)
>+			   struct radeon_crtc *crtc, unsigned int clock)
> {
> 	/* Two dtos; generally use dto1 for DP */
> 	u32 value = 0;
>diff --git a/drivers/gpu/drm/radeon/radeon_audio.c b/drivers/gpu/drm/radeon/radeon_audio.c
>index fa719c5..3a3bca9 100644
>--- a/drivers/gpu/drm/radeon/radeon_audio.c
>+++ b/drivers/gpu/drm/radeon/radeon_audio.c
>@@ -245,6 +245,28 @@ 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;
>+
>+	if (rdev->mode_info.mode_config_initialized) {
>+		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->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);
> }
>@@ -451,29 +473,23 @@ static void radeon_audio_select_pin(struct drm_encoder *encoder)
> }
> 
> void radeon_audio_detect(struct drm_connector *connector,
>+			 struct drm_encoder *encoder,
> 			 enum drm_connector_status status)
> {
>-	struct radeon_device *rdev;
>-	struct radeon_encoder *radeon_encoder;
>+	struct drm_device *dev = connector->dev;
>+	struct radeon_device *rdev = dev->dev_private;
>+	struct radeon_encoder *radeon_encoder = to_radeon_encoder(encoder);
> 	struct radeon_encoder_atom_dig *dig;
> 
>-	if (!connector || !connector->encoder)
>+	if (!radeon_audio_chipset_supported(rdev))
> 		return;
> 
>-	rdev = connector->encoder->dev->dev_private;
>-
>-	if (!radeon_audio_chipset_supported(rdev))
>+	if (!radeon_encoder_is_digital(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,11 +502,17 @@ 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->pin)
>+				dig->pin = radeon_audio_get_pin(encoder);
>+			radeon_audio_enable(rdev, dig->pin, 0xf);
>+		} else {
>+			radeon_audio_enable(rdev, dig->pin, 0);
>+			dig->pin = NULL;
>+		}
> 	} else {
>-		radeon_audio_enable(rdev, dig->afmt->pin, 0);
>-		dig->afmt->pin = NULL;
>+		radeon_audio_enable(rdev, dig->pin, 0);
>+		dig->pin = NULL;
> 	}
> }
> 
>diff --git a/drivers/gpu/drm/radeon/radeon_audio.h b/drivers/gpu/drm/radeon/radeon_audio.h
>index 8438304..059cc30 100644
>--- a/drivers/gpu/drm/radeon/radeon_audio.h
>+++ b/drivers/gpu/drm/radeon/radeon_audio.h
>@@ -68,7 +68,8 @@ struct radeon_audio_funcs
> 
> int radeon_audio_init(struct radeon_device *rdev);
> void radeon_audio_detect(struct drm_connector *connector,
>-	enum drm_connector_status status);
>+			 struct drm_encoder *encoder,
>+			 enum drm_connector_status status);
> u32 radeon_audio_endpoint_rreg(struct radeon_device *rdev,
> 	u32 offset, u32 reg);
> void radeon_audio_endpoint_wreg(struct radeon_device *rdev,
>diff --git a/drivers/gpu/drm/radeon/radeon_connectors.c b/drivers/gpu/drm/radeon/radeon_connectors.c
>index cebb65e..94b21ae 100644
>--- a/drivers/gpu/drm/radeon/radeon_connectors.c
>+++ b/drivers/gpu/drm/radeon/radeon_connectors.c
>@@ -1379,8 +1379,16 @@ out:
> 	/* updated in get modes as well since we need to know if it's analog or digital */
> 	radeon_connector_update_scratch_regs(connector, ret);
> 
>-	if (radeon_audio != 0)
>-		radeon_audio_detect(connector, ret);
>+	if ((radeon_audio != 0) && radeon_connector->use_digital) {
>+		const struct drm_connector_helper_funcs *connector_funcs =
>+			connector->helper_private;
>+
>+		encoder = connector_funcs->best_encoder(connector);
>+		if (encoder && (encoder->encoder_type == DRM_MODE_ENCODER_TMDS)) {
>+			radeon_connector_get_edid(connector);
>+			radeon_audio_detect(connector, encoder, ret);
>+		}
>+	}
> 
> exit:
> 	pm_runtime_mark_last_busy(connector->dev->dev);
>@@ -1717,8 +1725,10 @@ radeon_dp_detect(struct drm_connector *connector, bool force)
> 
> 	radeon_connector_update_scratch_regs(connector, ret);
> 
>-	if (radeon_audio != 0)
>-		radeon_audio_detect(connector, ret);
>+	if ((radeon_audio != 0) && encoder) {
>+		radeon_connector_get_edid(connector);
>+		radeon_audio_detect(connector, encoder, ret);
>+	}
> 
> out:
> 	pm_runtime_mark_last_busy(connector->dev->dev);
>diff --git a/drivers/gpu/drm/radeon/radeon_mode.h b/drivers/gpu/drm/radeon/radeon_mode.h
>index fa91a17..d517f42 100644
>--- a/drivers/gpu/drm/radeon/radeon_mode.h
>+++ b/drivers/gpu/drm/radeon/radeon_mode.h
>@@ -237,7 +237,6 @@ struct radeon_afmt {
> 	int offset;
> 	bool last_buffer_filled_status;
> 	int id;
>-	struct r600_audio_pin *pin;
> };
> 
> struct radeon_mode_info {
>@@ -440,6 +439,7 @@ struct radeon_encoder_atom_dig {
> 	uint8_t backlight_level;
> 	int panel_mode;
> 	struct radeon_afmt *afmt;
>+	struct r600_audio_pin *pin;
> 	int active_mst_links;
> };
> 
>-- 
>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.