summaryrefslogtreecommitdiffstats
path: root/drivers/gpu/drm/radeon/r600_hdmi.c
diff options
context:
space:
mode:
authorSlava Grigorev <slava.grigorev@amd.com>2014-12-02 15:22:43 -0500
committerAlex Deucher <alexander.deucher@amd.com>2015-01-22 10:42:07 -0500
commit3cdde027aae8b2d3f49912e463f8083da50c8611 (patch)
tree86f33990b39048ada1505ea3468431e90b6deb7d /drivers/gpu/drm/radeon/r600_hdmi.c
parent87654f87af2a06f325cc1a1a6e6a6a27f8837bf3 (diff)
downloadlinux-3cdde027aae8b2d3f49912e463f8083da50c8611.tar.bz2
radeon/audio: consolidate audio_get_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/r600_hdmi.c')
-rw-r--r--drivers/gpu/drm/radeon/r600_hdmi.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/gpu/drm/radeon/r600_hdmi.c b/drivers/gpu/drm/radeon/r600_hdmi.c
index 96a26b0c435b..53159a2c7899 100644
--- a/drivers/gpu/drm/radeon/r600_hdmi.c
+++ b/drivers/gpu/drm/radeon/r600_hdmi.c
@@ -29,6 +29,7 @@
#include <drm/radeon_drm.h>
#include "radeon.h"
#include "radeon_asic.h"
+#include "radeon_audio.h"
#include "r600d.h"
#include "atom.h"
@@ -487,7 +488,7 @@ void r600_hdmi_setmode(struct drm_encoder *encoder, struct drm_display_mode *mod
offset = dig->afmt->offset;
/* disable audio prior to setting up hw */
- dig->afmt->pin = r600_audio_get_pin(rdev);
+ dig->afmt->pin = radeon_audio_get_pin(encoder);
r600_audio_enable(rdev, dig->afmt->pin, 0xf);
r600_audio_set_dto(encoder, mode->clock);