Skip to content

Commit

Permalink
drm/radeon/audio: don't set speaker allocation on DCE4+
Browse files Browse the repository at this point in the history
It causes hangs on some asics.  Disable on DCE6+ as well
just to be on the safe side.

Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
  • Loading branch information
Alex Deucher committed Oct 19, 2013
1 parent 108dc8e commit 555b1b6
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 0 deletions.
3 changes: 3 additions & 0 deletions drivers/gpu/drm/radeon/dce6_afmt.c
Original file line number Diff line number Diff line change
Expand Up @@ -113,6 +113,9 @@ 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: 3 additions & 0 deletions drivers/gpu/drm/radeon/evergreen_hdmi.c
Original file line number Diff line number Diff line change
Expand Up @@ -67,6 +67,9 @@ 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 555b1b6

Please sign in to comment.