From 3cdde027aae8b2d3f49912e463f8083da50c8611 Mon Sep 17 00:00:00 2001 From: Slava Grigorev Date: Tue, 2 Dec 2014 15:22:43 -0500 Subject: radeon/audio: consolidate audio_get_pin() functions Reviewed-by: Christian König Signed-off-by: Slava Grigorev Signed-off-by: Alex Deucher --- drivers/gpu/drm/radeon/r600_hdmi.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'drivers/gpu/drm/radeon/r600_hdmi.c') 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 #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); -- cgit v1.2.3