aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/gpu/drm/radeon/evergreen_hdmi.c
diff options
context:
space:
mode:
authorAlex Deucher <alexander.deucher@amd.com>2013-11-08 13:07:51 -0500
committerAlex Deucher <alexander.deucher@amd.com>2013-11-08 13:07:51 -0500
commit28ed756f1f4cf778785e6b627cabdcf337070fd6 (patch)
tree860553ad5fd441ee6b9a60fec706ab846669275f /drivers/gpu/drm/radeon/evergreen_hdmi.c
parenta2098250fbda149cfad9e626afe80abe3b21e574 (diff)
Revert "drm/radeon/audio: don't set speaker allocation on DCE4+"
This reverts commit 555b1b651acf44bf27ebbb04235d38a8fd2d58dc. Let's try this again for 3.13. It's required for proper interaction with alsa. Was disabled previously in 3.12 to be on the safe side since it caused problems on older asics.
Diffstat (limited to 'drivers/gpu/drm/radeon/evergreen_hdmi.c')
-rw-r--r--drivers/gpu/drm/radeon/evergreen_hdmi.c3
1 files changed, 0 insertions, 3 deletions
diff --git a/drivers/gpu/drm/radeon/evergreen_hdmi.c b/drivers/gpu/drm/radeon/evergreen_hdmi.c
index adbfef870501..aa695c4feb3d 100644
--- a/drivers/gpu/drm/radeon/evergreen_hdmi.c
+++ b/drivers/gpu/drm/radeon/evergreen_hdmi.c
@@ -105,9 +105,6 @@ static void dce4_afmt_write_speaker_allocation(struct drm_encoder *encoder)
105 u8 *sadb; 105 u8 *sadb;
106 int sad_count; 106 int sad_count;
107 107
108 /* XXX: setting this register causes hangs on some asics */
109 return;
110
111 list_for_each_entry(connector, &encoder->dev->mode_config.connector_list, head) { 108 list_for_each_entry(connector, &encoder->dev->mode_config.connector_list, head) {
112 if (connector->encoder == encoder) { 109 if (connector->encoder == encoder) {
113 radeon_connector = to_radeon_connector(connector); 110 radeon_connector = to_radeon_connector(connector);