Skip to content

Commit

Permalink
Revert "drm/radeon/audio: don't set speaker allocation on DCE4+"
Browse files Browse the repository at this point in the history
This reverts commit 555b1b6.

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.
  • Loading branch information
Alex Deucher committed Nov 8, 2013
1 parent a209825 commit 28ed756
Show file tree
Hide file tree
Showing 2 changed files with 0 additions and 6 deletions.
3 changes: 0 additions & 3 deletions drivers/gpu/drm/radeon/dce6_afmt.c
Original file line number Diff line number Diff line change
Expand Up @@ -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;

Expand Down
3 changes: 0 additions & 3 deletions drivers/gpu/drm/radeon/evergreen_hdmi.c
Original file line number Diff line number Diff line change
Expand Up @@ -105,9 +105,6 @@ static void dce4_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);
Expand Down

0 comments on commit 28ed756

Please sign in to comment.