summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAlex Deucher2014-02-18 17:12:11 +0100
committerAlex Deucher2014-02-27 20:21:37 +0100
commit3803c8e5b50946dd6bc18972d9190757d05648f0 (patch)
tree5a172b1647c904cca5d2fc6ed9a4ce1d8c6e98cf
parentdrm/radeon: change audio enable logic (diff)
downloadkernel-qcow2-linux-3803c8e5b50946dd6bc18972d9190757d05648f0.tar.gz
kernel-qcow2-linux-3803c8e5b50946dd6bc18972d9190757d05648f0.tar.xz
kernel-qcow2-linux-3803c8e5b50946dd6bc18972d9190757d05648f0.zip
drm/radeon: enable speaker allocation setup on dce3.2
Now that we disable audio while setting up the audio hw, we should be able to set this up without hangs. Signed-off-by: Alex Deucher <alexander.deucher@amd.com> Reviewed-by: Christian König <christian.koenig@amd.com>
-rw-r--r--drivers/gpu/drm/radeon/r600_hdmi.c3
1 files changed, 0 insertions, 3 deletions
diff --git a/drivers/gpu/drm/radeon/r600_hdmi.c b/drivers/gpu/drm/radeon/r600_hdmi.c
index ec810cd7247b..85a2bb28aed2 100644
--- a/drivers/gpu/drm/radeon/r600_hdmi.c
+++ b/drivers/gpu/drm/radeon/r600_hdmi.c
@@ -329,9 +329,6 @@ static void dce3_2_afmt_write_speaker_allocation(struct drm_encoder *encoder)
u8 *sadb;
int sad_count;
- /* XXX: setting this register causes hangs on some asics */
- return;
-
list_for_each_entry(connector, &encoder->dev->mode_config.connector_list, head) {
if (connector->encoder == encoder) {
radeon_connector = to_radeon_connector(connector);