diff options
| author | Slava Grigorev <slava.grigorev@amd.com> | 2014-12-09 16:44:18 -0500 |
|---|---|---|
| committer | Alex Deucher <alexander.deucher@amd.com> | 2015-01-22 10:42:14 -0500 |
| commit | 1852c9a09a25aad40c80b0012ad19379b1fb78be (patch) | |
| tree | f23f88376cea027ed0e0b392b238fe791587eec7 /drivers/gpu/drm/radeon/radeon_audio.c | |
| parent | baa7d8e451f030c049f83f943b9995620d6d6bd3 (diff) | |
radeon/audio: moved audio packet programming to a separate function
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 | 19 |
1 files changed, 19 insertions, 0 deletions
diff --git a/drivers/gpu/drm/radeon/radeon_audio.c b/drivers/gpu/drm/radeon/radeon_audio.c index cafd2f8ec7c1..e29d6552bb62 100644 --- a/drivers/gpu/drm/radeon/radeon_audio.c +++ b/drivers/gpu/drm/radeon/radeon_audio.c @@ -89,6 +89,9 @@ void r600_set_vbi_packet(struct drm_encoder *encoder, u32 offset); void dce4_set_vbi_packet(struct drm_encoder *encoder, u32 offset); void dce4_hdmi_set_color_depth(struct drm_encoder *encoder, u32 offset, int bpc); +void r600_set_audio_packet(struct drm_encoder *encoder, u32 offset); +void dce3_2_set_audio_packet(struct drm_encoder *encoder, u32 offset); +void dce4_set_audio_packet(struct drm_encoder *encoder, u32 offset); static const u32 pin_offsets[7] = { @@ -142,6 +145,7 @@ static struct radeon_audio_funcs r600_hdmi_funcs = { .update_acr = r600_hdmi_update_acr, .set_vbi_packet = r600_set_vbi_packet, .set_avi_packet = r600_set_avi_packet, + .set_audio_packet = r600_set_audio_packet, }; static struct radeon_audio_funcs dce32_hdmi_funcs = { @@ -152,6 +156,7 @@ static struct radeon_audio_funcs dce32_hdmi_funcs = { .update_acr = dce3_2_hdmi_update_acr, .set_vbi_packet = r600_set_vbi_packet, .set_avi_packet = r600_set_avi_packet, + .set_audio_packet = dce3_2_set_audio_packet, }; static struct radeon_audio_funcs dce32_dp_funcs = { @@ -172,6 +177,7 @@ static struct radeon_audio_funcs dce4_hdmi_funcs = { .set_vbi_packet = dce4_set_vbi_packet, .set_color_depth = dce4_hdmi_set_color_depth, .set_avi_packet = evergreen_set_avi_packet, + .set_audio_packet = dce4_set_audio_packet, }; static struct radeon_audio_funcs dce4_dp_funcs = { @@ -194,6 +200,7 @@ static struct radeon_audio_funcs dce6_hdmi_funcs = { .set_vbi_packet = dce4_set_vbi_packet, .set_color_depth = dce4_hdmi_set_color_depth, .set_avi_packet = evergreen_set_avi_packet, + .set_audio_packet = dce4_set_audio_packet, }; static struct radeon_audio_funcs dce6_dp_funcs = { @@ -617,3 +624,15 @@ void radeon_hdmi_set_color_depth(struct drm_encoder *encoder) if (radeon_encoder->audio && radeon_encoder->audio->set_color_depth) radeon_encoder->audio->set_color_depth(encoder, dig->afmt->offset, bpc); } + +void radeon_audio_set_audio_packet(struct drm_encoder *encoder) +{ + struct radeon_encoder *radeon_encoder = to_radeon_encoder(encoder); + struct radeon_encoder_atom_dig *dig = radeon_encoder->enc_priv; + + if (!dig || !dig->afmt) + return; + + if (radeon_encoder->audio && radeon_encoder->audio->set_audio_packet) + radeon_encoder->audio->set_audio_packet(encoder, dig->afmt->offset); +} |