diff options
| author | Slava Grigorev <slava.grigorev@amd.com> | 2014-12-02 23:22:43 +0300 |
|---|---|---|
| committer | Alex Deucher <alexander.deucher@amd.com> | 2015-01-22 18:42:07 +0300 |
| commit | 3cdde027aae8b2d3f49912e463f8083da50c8611 (patch) | |
| tree | 86f33990b39048ada1505ea3468431e90b6deb7d /drivers/gpu/drm/radeon/evergreen_hdmi.c | |
| parent | 87654f87af2a06f325cc1a1a6e6a6a27f8837bf3 (diff) | |
| download | linux-3cdde027aae8b2d3f49912e463f8083da50c8611.tar.xz | |
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/evergreen_hdmi.c')
| -rw-r--r-- | drivers/gpu/drm/radeon/evergreen_hdmi.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/drivers/gpu/drm/radeon/evergreen_hdmi.c b/drivers/gpu/drm/radeon/evergreen_hdmi.c index aa8a31b99c6e..26d8cd5c20a1 100644 --- 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); } |