summaryrefslogtreecommitdiffstats
path: root/drivers/gpu/drm/radeon/dce6_afmt.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/dce6_afmt.c
parenta2098250fbda149cfad9e626afe80abe3b21e574 (diff)
downloadop-kernel-dev-28ed756f1f4cf778785e6b627cabdcf337070fd6.zip
op-kernel-dev-28ed756f1f4cf778785e6b627cabdcf337070fd6.tar.gz
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/dce6_afmt.c')
-rw-r--r--drivers/gpu/drm/radeon/dce6_afmt.c3
1 files changed, 0 insertions, 3 deletions
diff --git a/drivers/gpu/drm/radeon/dce6_afmt.c b/drivers/gpu/drm/radeon/dce6_afmt.c
index 85c4993..009f46e 100644
--- a/drivers/gpu/drm/radeon/dce6_afmt.c
+++ b/drivers/gpu/drm/radeon/dce6_afmt.c
@@ -156,9 +156,6 @@ void dce6_afmt_write_speaker_allocation(struct drm_encoder *encoder)
u8 *sadb;
int sad_count;
- /* XXX: setting this register causes hangs on some asics */
- return;
-
if (!dig->afmt->pin)
return;
OpenPOWER on IntegriCloud