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>

diff --git a/drivers/gpu/drm/radeon/dce3_1_afmt.c b/drivers/gpu/drm/radeon/dce3_1_afmt.c
index 613e611..f4cddb2 100644 (file)
--- a/drivers/gpu/drm/radeon/dce3_1_afmt.c
+++ b/drivers/gpu/drm/radeon/dce3_1_afmt.c
@@ -136,7 +136,7 @@ void dce3_1_hdmi_setmode(struct drm_encoder *encoder, struct drm_display_mode *m
        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, 0);
 
        r600_audio_set_dto(encoder, mode->clock);

diff --git a/drivers/gpu/drm/radeon/evergreen_hdmi.c b/drivers/gpu/drm/radeon/evergreen_hdmi.c
index aa8a31b..26d8cd5 100644 (file)
--- a/drivers/gpu/drm/radeon/evergreen_hdmi.c
+++ b/drivers/gpu/drm/radeon/evergreen_hdmi.c
@@ -301,11 +301,10 @@ void evergreen_hdmi_setmode(struct drm_encoder *encoder, struct drm_display_mode
        }
 
        /* disable audio prior to setting up hw */
+       dig->afmt->pin = radeon_audio_get_pin(encoder);
        if (ASIC_IS_DCE6(rdev)) {
-               dig->afmt->pin = dce6_audio_get_pin(rdev);
                dce6_audio_enable(rdev, dig->afmt->pin, 0);
        } else {
-               dig->afmt->pin = r600_audio_get_pin(rdev);
                dce4_audio_enable(rdev, dig->afmt->pin, 0);
        }
 

diff --cc drivers/gpu/drm/radeon/r600_hdmi.c
Simple merge

diff --cc drivers/gpu/drm/radeon/radeon_audio.c
Simple merge

diff --cc drivers/gpu/drm/radeon/radeon_audio.h
Simple merge