summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAlex Deucher <alexander.deucher@amd.com>2013-12-12 18:13:17 +0100
committerAlex Deucher <alexander.deucher@amd.com>2013-12-17 15:23:14 +0100
commit533518a43ab9d662c864a9b63a6723050bfea488 (patch)
tree075e903fc4a585a8340108a8682846d77dff2de5
parentMerge branch 'ttm-fixes-3.13' of git://people.freedesktop.org/~thomash/linux ... (diff)
downloadlinux-533518a43ab9d662c864a9b63a6723050bfea488.tar.xz
linux-533518a43ab9d662c864a9b63a6723050bfea488.zip
drm/radeon/dce6: set correct number of audio pins
DCE6.0, 8.x has 6 DCE6.1 has 4 Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
-rw-r--r--drivers/gpu/drm/radeon/dce6_afmt.c4
1 files changed, 3 insertions, 1 deletions
diff --git a/drivers/gpu/drm/radeon/dce6_afmt.c b/drivers/gpu/drm/radeon/dce6_afmt.c
index de86493cbc44..ab59fd76f2d9 100644
--- a/drivers/gpu/drm/radeon/dce6_afmt.c
+++ b/drivers/gpu/drm/radeon/dce6_afmt.c
@@ -308,7 +308,9 @@ int dce6_audio_init(struct radeon_device *rdev)
rdev->audio.enabled = true;
if (ASIC_IS_DCE8(rdev))
- rdev->audio.num_pins = 7;
+ rdev->audio.num_pins = 6;
+ else if (ASIC_IS_DCE61(rdev))
+ rdev->audio.num_pins = 4;
else
rdev->audio.num_pins = 6;