Attachment 116085 Details for Bug 90681 – possible fix

[patch] possible fix

0001-drm-radeon-audio-make-sure-connector-is-valid-in-hot.patch (text/plain), 1.81 KB, created by Alex Deucher on 2015-05-27 15:37:40 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Alex Deucher

Created: 2015-05-27 15:37:40 UTC

Size: 1.81 KB

patch

obsolete

>From 497abfeb7992b0076c547e9a112fcb0ee1840597 Mon Sep 17 00:00:00 2001
>From: Alex Deucher <alexander.deucher@amd.com>
>Date: Wed, 27 May 2015 11:33:26 -0400
>Subject: [PATCH] drm/radeon/audio: make sure connector is valid in hotplug
> case
>
>Avoids a crash when a monitor is hotplugged and the encoder
>and connector are not linked yet.
>
>bug:
>https://bugs.freedesktop.org/show_bug.cgi?id=90681
>
>Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
>Cc: stable@vger.kernel.org
>---
> drivers/gpu/drm/radeon/evergreen_hdmi.c | 5 +++--
> 1 file changed, 3 insertions(+), 2 deletions(-)
>
>diff --git a/drivers/gpu/drm/radeon/evergreen_hdmi.c b/drivers/gpu/drm/radeon/evergreen_hdmi.c
>index 0926739..9953356 100644
>--- a/drivers/gpu/drm/radeon/evergreen_hdmi.c
>+++ b/drivers/gpu/drm/radeon/evergreen_hdmi.c
>@@ -400,7 +400,7 @@ void evergreen_hdmi_enable(struct drm_encoder *encoder, bool enable)
> 	if (enable) {
> 		struct drm_connector *connector = radeon_get_connector_for_encoder(encoder);
> 
>-		if (drm_detect_monitor_audio(radeon_connector_edid(connector))) {
>+		if (connector && drm_detect_monitor_audio(radeon_connector_edid(connector))) {
> 			WREG32(HDMI_INFOFRAME_CONTROL0 + dig->afmt->offset,
> 			       HDMI_AVI_INFO_SEND | /* enable AVI info frames */
> 			       HDMI_AVI_INFO_CONT | /* required for audio info values to be updated */
>@@ -438,7 +438,8 @@ void evergreen_dp_enable(struct drm_encoder *encoder, bool enable)
> 	if (!dig || !dig->afmt)
> 		return;
> 
>-	if (enable && drm_detect_monitor_audio(radeon_connector_edid(connector))) {
>+	if (enable && connector &&
>+	    drm_detect_monitor_audio(radeon_connector_edid(connector))) {
> 		struct drm_connector *connector = radeon_get_connector_for_encoder(encoder);
> 		struct radeon_connector *radeon_connector = to_radeon_connector(connector);
> 		struct radeon_connector_atom_dig *dig_connector;
>-- 
>1.8.3.1
>

Actions: View | Splinter Review

Attachments on bug 90681: 116079 | 116080 | 116081 | 116082 | 116083 | 116085

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.