diff options
| author | Slava Grigorev <slava.grigorev@amd.com> | 2014-12-03 15:29:53 -0500 |
|---|---|---|
| committer | Alex Deucher <alexander.deucher@amd.com> | 2015-01-22 10:42:08 -0500 |
| commit | 8bf598207efb35ea17075b11bf116043c18aca40 (patch) | |
| tree | 22f33e3df794f6117eda5053ddc420963475d46a /drivers/gpu/drm/radeon/radeon_audio.c | |
| parent | 88252d7728f414a838f6a7cfbe895ba708e8d26d (diff) | |
radeon/audio: consolidate audio_enable() 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/radeon_audio.c')
| -rw-r--r-- | drivers/gpu/drm/radeon/radeon_audio.c | 17 |
1 files changed, 13 insertions, 4 deletions
diff --git a/drivers/gpu/drm/radeon/radeon_audio.c b/drivers/gpu/drm/radeon/radeon_audio.c index 5aedf5b97b96..eed5c740cefa 100644 --- a/drivers/gpu/drm/radeon/radeon_audio.c +++ b/drivers/gpu/drm/radeon/radeon_audio.c @@ -30,6 +30,8 @@ void r600_audio_enable(struct radeon_device *rdev, struct r600_audio_pin *pin, u8 enable_mask); +void dce4_audio_enable(struct radeon_device *rdev, struct r600_audio_pin *pin, + u8 enable_mask); void dce6_audio_enable(struct radeon_device *rdev, struct r600_audio_pin *pin, u8 enable_mask); u32 dce6_endpoint_rreg(struct radeon_device *rdev, u32 offset, u32 reg); @@ -86,16 +88,19 @@ static void radeon_audio_wreg(struct radeon_device *rdev, u32 offset, static struct radeon_audio_basic_funcs dce32_funcs = { .endpoint_rreg = radeon_audio_rreg, .endpoint_wreg = radeon_audio_wreg, + .enable = r600_audio_enable, }; static struct radeon_audio_basic_funcs dce4_funcs = { .endpoint_rreg = radeon_audio_rreg, .endpoint_wreg = radeon_audio_wreg, + .enable = dce4_audio_enable, }; static struct radeon_audio_basic_funcs dce6_funcs = { .endpoint_rreg = dce6_endpoint_rreg, .endpoint_wreg = dce6_endpoint_wreg, + .enable = dce6_audio_enable, }; static struct radeon_audio_funcs dce32_hdmi_funcs = { @@ -201,10 +206,7 @@ int radeon_audio_init(struct radeon_device *rdev) /* disable audio. it will be set up later */ for (i = 0; i < rdev->audio.num_pins; i++) - if (ASIC_IS_DCE6(rdev)) - dce6_audio_enable(rdev, &rdev->audio.pin[i], false); - else - r600_audio_enable(rdev, &rdev->audio.pin[i], false); + radeon_audio_enable(rdev, &rdev->audio.pin[i], false); return 0; } @@ -371,3 +373,10 @@ void radeon_audio_select_pin(struct drm_encoder *encoder) if (radeon_encoder->audio && radeon_encoder->audio->select_pin) radeon_encoder->audio->select_pin(encoder); } + +void radeon_audio_enable(struct radeon_device *rdev, + struct r600_audio_pin *pin, u8 enable_mask) +{ + if (rdev->audio.funcs->enable) + rdev->audio.funcs->enable(rdev, pin, enable_mask); +} |