From: Alex Deucher <alexander.deucher@amd.com>
Date: Tue, 18 Feb 2014 16:12:11 +0000 (-0500)
Subject: drm/radeon: enable speaker allocation setup on dce3.2
X-Git-Tag: submit/tizen_common/20140905.094502~83
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=b8f9aeff0a2ca24f4bfda5edd3a96711c641ed4e;p=sdk%2Femulator%2Femulator-kernel.git

drm/radeon: enable speaker allocation setup on dce3.2

commit 3803c8e5b50946dd6bc18972d9190757d05648f0 upstream.

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>
Signed-off-by: Jiri Slaby <jslaby@suse.cz>
---

diff --git a/drivers/gpu/drm/radeon/r600_hdmi.c b/drivers/gpu/drm/radeon/r600_hdmi.c
index 9ba0675d0682..d38b725563e4 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);