Patch "drm/radeon: only check the sink type on DP connectors" has been added to the 4.1-stable tree
Subsystems (3)
This is a note to let you know that I've just added the patch titled
drm/radeon: only check the sink type on DP connectors
to the 4.1-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-only-check-the-sink-type-on-dp-connectors.patch
and it can be found in the queue-4.1 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
479e9a95120aaae0bf0d3e0b5b26b36ac4a347b6Mon Sep 17 00:00:00 2001
From: Alex Deucher <[email protected]>
Date: Tue, 30 Jun 2015 09:30:01 -0400
Subject: drm/radeon: only check the sink type on DP connectors
From: Alex Deucher <[email protected]>
commit 479e9a95120aaae0bf0d3e0b5b26b36ac4a347b6 upstream.
Avoids a crash on pre-DP asics that support HDMI.
--- drivers/gpu/drm/radeon/radeon_audio.c | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-)
drivers/gpu/drm/radeon/radeon_audio.c +9 -9
@@ -469,22 +469,22 @@ void radeon_audio_detect(struct drm_conn dig = radeon_encoder->enc_priv;if (status == connector_status_connected) { -struct radeon_connector *radeon_connector; -int sink_type; -if (!drm_detect_monitor_audio (radeon_connector_edid (connector))) { radeon_encoder->audio =NULL ;return ; } - radeon_connector =to_radeon_connector (connector); - sink_type =radeon_dp_getsinktype (radeon_connector); +if (connector->connector_type == DRM_MODE_CONNECTOR_DisplayPort) { +struct radeon_connector *radeon_connector =to_radeon_connector (connector); -if (connector->connector_type == DRM_MODE_CONNECTOR_DisplayPort && - sink_type ==CONNECTOR_OBJECT_ID_DISPLAYPORT ) - radeon_encoder->audio = rdev->audio.dp_funcs; -else +if (radeon_dp_getsinktype (radeon_connector) == +CONNECTOR_OBJECT_ID_DISPLAYPORT ) + radeon_encoder->audio = rdev->audio.dp_funcs; +else + radeon_encoder->audio = rdev->audio.hdmi_funcs; + }else { radeon_encoder->audio = rdev->audio.hdmi_funcs; + } dig->afmt->pin =radeon_audio_get_pin (connector->encoder);radeon_audio_enable (rdev, dig->afmt->pin,0xf );
Patches currently in stable-queue which might be from [email protected] are
queue-4.1/drm-radeon-handle-irqs-only-based-on-irq-ring-not-irq-status-regs.patch queue-4.1/drm-radeon-fix-hdp-flushing.patch queue-4.1/drm-radeon-fix-user-ptr-race-condition.patch queue-4.1/drm-radeon-add-a-dpm-quirk-for-sapphire-radeon-r9-270x-2gb-gddr5.patch queue-4.1/drm-radeon-compute-ring-fix-hibernation-ci-gpu-family-v2.patch queue-4.1/drm-radeon-only-check-the-sink-type-on-dp-connectors.patch queue-4.1/drm-radeon-clean-up-reference-counting-and-pinning-of-the-cursor-bos.patch queue-4.1/drm-radeon-unpin-cursor-bos-on-suspend-and-pin-them-again-on-resume-v2.patch queue-4.1/drm-radeon-ci-silence-a-harmless-pcc-warning.patch queue-4.1/drm-radeon-sdma-fix-hibernation-ci-gpu-family.patch queue-4.1/drm-radeon-clean-up-radeon_audio_enable.patch queue-4.1/revert-drm-radeon-dont-switch-vt-on-suspend.patch queue-4.1/drm-radeon-take-the-mode_config-mutex-when-dealing-with-hpds-v2.patch queue-4.1/drm-radeon-don-t-flush-the-gart-tlb-if-rdev-gart.ptr-null.patch