diff options
| author | Alex Deucher <alexander.deucher@amd.com> | 2013-10-18 20:00:09 -0400 |
|---|---|---|
| committer | Alex Deucher <alexander.deucher@amd.com> | 2013-10-18 20:00:09 -0400 |
| commit | 555b1b651acf44bf27ebbb04235d38a8fd2d58dc (patch) | |
| tree | 9eab6e29fc30d03ee5f545f6d0c509a568611513 | |
| parent | 108dc8e8b44a4c64ac53676cc05f6234340ccd4a (diff) | |
| download | op-kernel-dev-555b1b651acf44bf27ebbb04235d38a8fd2d58dc.zip op-kernel-dev-555b1b651acf44bf27ebbb04235d38a8fd2d58dc.tar.gz | |
drm/radeon/audio: don't set speaker allocation on DCE4+
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>
| -rw-r--r-- | drivers/gpu/drm/radeon/dce6_afmt.c | 3 | ||||
| -rw-r--r-- | drivers/gpu/drm/radeon/evergreen_hdmi.c | 3 |
2 files changed, 6 insertions, 0 deletions
diff --git a/drivers/gpu/drm/radeon/dce6_afmt.c b/drivers/gpu/drm/radeon/dce6_afmt.c index 85a69d2..9fcd338 100644 --- a/drivers/gpu/drm/radeon/dce6_afmt.c +++ b/drivers/gpu/drm/radeon/dce6_afmt.c @@ -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; diff --git a/drivers/gpu/drm/radeon/evergreen_hdmi.c b/drivers/gpu/drm/radeon/evergreen_hdmi.c index f815c20..fe1de85 100644 --- a/drivers/gpu/drm/radeon/evergreen_hdmi.c +++ b/drivers/gpu/drm/radeon/evergreen_hdmi.c @@ -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); |
