Skip to contentSkip to conversation

Patch "drm/radeon/audio: make sure connector is valid in hotplug case" has been added to the 4.0-stable tree

PATCH [email protected] 1 participant 1 message Jun 3, 2015

Subsystems (3)
lore
Share & tools
lore

[email protected]

author maintainer Applied
#0 lore raw

This is a note to let you know that I've just added the patch titled

drm/radeon/audio: make sure connector is valid in hotplug case

to the 4.0-stable tree which can be found at:
http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary

The filename of the patch is:
drm-radeon-audio-make-sure-connector-is-valid-in-hotplug-case.patch
and it can be found in the queue-4.0 subdirectory.

If you, or anyone else, feels it should not be added to the stable tree, please let <[email protected]> know about it.

Quoted 1 line

From fbfd3bc7dfd7efcad2d2e52bf634f84c80a77a35 Mon Sep 17 00:00:00 2001

From: Alex Deucher <[email protected]>
Date: Wed, 27 May 2015 11:33:26 -0400
Subject: drm/radeon/audio: make sure connector is valid in hotplug case

From: Alex Deucher <[email protected]>

commit fbfd3bc7dfd7efcad2d2e52bf634f84c80a77a35 upstream.

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

---
 drivers/gpu/drm/radeon/evergreen_hdmi.c |    5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)
drivers/gpu/drm/radeon/evergreen_hdmi.c +3 -2
@@ -400,7 +400,7 @@ void evergreen_hdmi_enable(struct drm_en
 	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_enco
 	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;

Patches currently in stable-queue which might be from [email protected] are

queue-4.0/drm-radeon-partially-revert-fix-vm_context-_page_table_end_addr-handling.patch queue-4.0/drm-radeon-don-t-share-plls-if-monitors-differ-in-audio-support.patch queue-4.0/drm-radeon-audio-make-sure-connector-is-valid-in-hotplug-case.patch queue-4.0/drm-radeon-fix-vm_context-_page_table_end_addr-handling.patch queue-4.0/drm-radeon-add-new-bonaire-pci-id.patch queue-4.0/revert-drm-radeon-only-mark-audio-as-connected-if-the-monitor-supports-it-v3.patch queue-4.0/drm-amdkfd-don-t-report-local-memory-size.patch queue-4.0/drm-radeon-retry-dcpd-fetch.patch