summaryrefslogtreecommitdiff
path: root/drivers/gpu/drm/radeon/evergreen_hdmi.c
diff options
context:
space:
mode:
authorSlava Grigorev <slava.grigorev@amd.com>2014-12-03 01:27:29 +0300
committerAlex Deucher <alexander.deucher@amd.com>2015-01-22 18:42:07 +0300
commit88252d7728f414a838f6a7cfbe895ba708e8d26d (patch)
tree642e13faa30c76f2475798bbcf4843ed8511141f /drivers/gpu/drm/radeon/evergreen_hdmi.c
parent3cdde027aae8b2d3f49912e463f8083da50c8611 (diff)
downloadlinux-88252d7728f414a838f6a7cfbe895ba708e8d26d.tar.xz
radeon/audio: consolidate select_pin() functions
Reviewed-by: Christian König <christian.koenig@amd.com> Signed-off-by: Slava Grigorev <slava.grigorev@amd.com> Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
Diffstat (limited to 'drivers/gpu/drm/radeon/evergreen_hdmi.c')
-rw-r--r--drivers/gpu/drm/radeon/evergreen_hdmi.c6
1 files changed, 1 insertions, 5 deletions
diff --git a/drivers/gpu/drm/radeon/evergreen_hdmi.c b/drivers/gpu/drm/radeon/evergreen_hdmi.c
index 26d8cd5c20a1..6bd113bc6551 100644
--- a/drivers/gpu/drm/radeon/evergreen_hdmi.c
+++ b/drivers/gpu/drm/radeon/evergreen_hdmi.c
@@ -33,8 +33,6 @@
#include "evergreend.h"
#include "atom.h"
-extern void dce6_afmt_select_pin(struct drm_encoder *encoder);
-
/* enable the audio stream */
static void dce4_audio_enable(struct radeon_device *rdev,
struct r600_audio_pin *pin,
@@ -401,9 +399,7 @@ void evergreen_hdmi_setmode(struct drm_encoder *encoder, struct drm_display_mode
/* fglrx sets 0x40 in 0x5f80 here */
- if (ASIC_IS_DCE6(rdev))
- dce6_afmt_select_pin(encoder);
-
+ radeon_audio_select_pin(encoder);
radeon_audio_write_sad_regs(encoder);
radeon_audio_write_latency_fields(encoder, mode);