Proxmox-Port/linux-loongson
1
0
Fork 0
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/chenhuacai/linux-loongson synced 2025-09-02 08:32:55 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

radeon/audio: consolidate audio_mode_set() functions

Browse Source 
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>
This commit is contained in:
Slava Grigorev 2014-12-10 10:43:51 -05:00 committed by Alex Deucher
parent 7f604077ac
commit 6e72376dcc
8 changed files with 66 additions and 162 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
drivers/gpu/drm/radeon/atombios_encoders.c
View File

@ -27,6 +27,7 @@
#include <drm/drm_crtc_helper.h> #include <drm/drm_crtc_helper.h>
#include <drm/radeon_drm.h> #include <drm/radeon_drm.h>
#include "radeon.h" #include "radeon.h"
#include "radeon_audio.h"
#include "atom.h" #include "atom.h"
#include <linux/backlight.h> #include <linux/backlight.h>
@ -2174,8 +2175,7 @@ radeon_atom_encoder_mode_set(struct drm_encoder *encoder,
if (atombios_get_encoder_mode(encoder) == ATOM_ENCODER_MODE_HDMI) { if (atombios_get_encoder_mode(encoder) == ATOM_ENCODER_MODE_HDMI) {
if (rdev->asic->display.hdmi_enable) if (rdev->asic->display.hdmi_enable)
radeon_hdmi_enable(rdev, encoder, true); radeon_hdmi_enable(rdev, encoder, true);
if (rdev->asic->display.hdmi_setmode) radeon_audio_mode_set(encoder, adjusted_mode);
radeon_hdmi_setmode(rdev, encoder, adjusted_mode);
} }
} }

41
drivers/gpu/drm/radeon/dce3_1_afmt.c
View File

@ -230,44 +230,3 @@ void dce3_2_set_mute(struct drm_encoder *encoder, u32 offset, bool mute)
else else
WREG32_AND(HDMI0_GC + offset, ~HDMI0_GC_AVMUTE); WREG32_AND(HDMI0_GC + offset, ~HDMI0_GC_AVMUTE);
} }
/*
* update the info frames with the data from the current display mode
*/
void dce3_1_hdmi_setmode(struct drm_encoder *encoder, struct drm_display_mode *mode)
{
struct drm_device *dev = encoder->dev;
struct radeon_device *rdev = dev->dev_private;
struct radeon_encoder *radeon_encoder = to_radeon_encoder(encoder);
struct radeon_encoder_atom_dig *dig = radeon_encoder->enc_priv;
uint32_t offset;
if (!dig || !dig->afmt)
return;
/* Silent, r600_hdmi_enable will raise WARN for us */
if (!dig->afmt->enabled)
return;
offset = dig->afmt->offset;
/* disable audio prior to setting up hw */
dig->afmt->pin = radeon_audio_get_pin(encoder);
radeon_audio_enable(rdev, dig->afmt->pin, 0);
radeon_audio_set_dto(encoder, mode->clock);
radeon_audio_set_vbi_packet(encoder);
radeon_hdmi_set_color_depth(encoder);
radeon_audio_set_mute(encoder, false);
radeon_audio_update_acr(encoder, mode->clock);
radeon_audio_write_speaker_allocation(encoder);
radeon_audio_set_audio_packet(encoder);
radeon_audio_write_sad_regs(encoder);
if (radeon_audio_set_avi_packet(encoder, mode) < 0)
return;
r600_hdmi_audio_workaround(encoder);
/* enable audio after to setting up hw */
radeon_audio_enable(rdev, dig->afmt->pin, 0xf);
}

41
drivers/gpu/drm/radeon/evergreen_hdmi.c
View File

@ -398,47 +398,6 @@ void dce4_set_mute(struct drm_encoder *encoder, u32 offset, bool mute)
WREG32_AND(HDMI_GC + offset, ~HDMI_GC_AVMUTE); WREG32_AND(HDMI_GC + offset, ~HDMI_GC_AVMUTE);
} }
/*
* update the info frames with the data from the current display mode
*/
void evergreen_hdmi_setmode(struct drm_encoder *encoder, struct drm_display_mode *mode)
{
struct drm_device *dev = encoder->dev;
struct radeon_device *rdev = dev->dev_private;
struct radeon_encoder *radeon_encoder = to_radeon_encoder(encoder);
struct radeon_encoder_atom_dig *dig = radeon_encoder->enc_priv;
uint32_t offset;
if (!dig || !dig->afmt)
return;
/* Silent, r600_hdmi_enable will raise WARN for us */
if (!dig->afmt->enabled)
return;
offset = dig->afmt->offset;
/* disable audio prior to setting up hw */
dig->afmt->pin = radeon_audio_get_pin(encoder);
radeon_audio_enable(rdev, dig->afmt->pin, 0);
radeon_audio_set_dto(encoder, mode->clock);
radeon_audio_set_vbi_packet(encoder);
radeon_hdmi_set_color_depth(encoder);
radeon_audio_set_mute(encoder, false);
radeon_audio_update_acr(encoder, mode->clock);
radeon_audio_write_speaker_allocation(encoder);
radeon_audio_set_audio_packet(encoder);
radeon_audio_select_pin(encoder);
radeon_audio_write_sad_regs(encoder);
radeon_audio_write_latency_fields(encoder, mode);
if (radeon_audio_set_avi_packet(encoder, mode) < 0)
return;
/* enable audio after to setting up hw */
radeon_audio_enable(rdev, dig->afmt->pin, 0xf);
}
void evergreen_hdmi_enable(struct drm_encoder *encoder, bool enable) void evergreen_hdmi_enable(struct drm_encoder *encoder, bool enable)
{ {
struct drm_device *dev = encoder->dev; struct drm_device *dev = encoder->dev;

37
drivers/gpu/drm/radeon/r600_hdmi.c
View File

@ -400,43 +400,6 @@ void r600_set_mute(struct drm_encoder *encoder, u32 offset, bool mute)
WREG32_AND(HDMI0_GC + offset, ~HDMI0_GC_AVMUTE); WREG32_AND(HDMI0_GC + offset, ~HDMI0_GC_AVMUTE);
} }
/*
* update the info frames with the data from the current display mode
*/
void r600_hdmi_setmode(struct drm_encoder *encoder, struct drm_display_mode *mode)
{
struct drm_device *dev = encoder->dev;
struct radeon_device *rdev = dev->dev_private;
struct radeon_encoder *radeon_encoder = to_radeon_encoder(encoder);
struct radeon_encoder_atom_dig *dig = radeon_encoder->enc_priv;
uint32_t offset;
if (!dig || !dig->afmt)
return;
/* Silent, r600_hdmi_enable will raise WARN for us */
if (!dig->afmt->enabled)
return;
offset = dig->afmt->offset;
/* disable audio prior to setting up hw */
dig->afmt->pin = radeon_audio_get_pin(encoder);
radeon_audio_enable(rdev, dig->afmt->pin, 0);
radeon_audio_set_dto(encoder, mode->clock);
radeon_audio_set_vbi_packet(encoder);
radeon_hdmi_set_color_depth(encoder);
radeon_audio_set_mute(encoder, false);
radeon_audio_update_acr(encoder, mode->clock);
radeon_audio_set_audio_packet(encoder);
if (radeon_audio_set_avi_packet(encoder, mode) < 0)
return;
/* enable audio after to setting up hw */
radeon_audio_enable(rdev, dig->afmt->pin, 0xf);
}
/** /**
* r600_hdmi_update_audio_settings - Update audio infoframe * r600_hdmi_update_audio_settings - Update audio infoframe
* *

14
drivers/gpu/drm/radeon/radeon_asic.c
View File

@ -639,7 +639,6 @@ static struct radeon_asic rs600_asic = {
.set_backlight_level = &atombios_set_backlight_level, .set_backlight_level = &atombios_set_backlight_level,
.get_backlight_level = &atombios_get_backlight_level, .get_backlight_level = &atombios_get_backlight_level,
.hdmi_enable = &r600_hdmi_enable, .hdmi_enable = &r600_hdmi_enable,
.hdmi_setmode = &r600_hdmi_setmode,
}, },
.copy = { .copy = {
.blit = &r100_copy_blit, .blit = &r100_copy_blit,
@ -707,7 +706,6 @@ static struct radeon_asic rs690_asic = {
.set_backlight_level = &atombios_set_backlight_level, .set_backlight_level = &atombios_set_backlight_level,
.get_backlight_level = &atombios_get_backlight_level, .get_backlight_level = &atombios_get_backlight_level,
.hdmi_enable = &r600_hdmi_enable, .hdmi_enable = &r600_hdmi_enable,
.hdmi_setmode = &r600_hdmi_setmode,
}, },
.copy = { .copy = {
.blit = &r100_copy_blit, .blit = &r100_copy_blit,
@ -936,7 +934,6 @@ static struct radeon_asic r600_asic = {
.set_backlight_level = &atombios_set_backlight_level, .set_backlight_level = &atombios_set_backlight_level,
.get_backlight_level = &atombios_get_backlight_level, .get_backlight_level = &atombios_get_backlight_level,
.hdmi_enable = &r600_hdmi_enable, .hdmi_enable = &r600_hdmi_enable,
.hdmi_setmode = &r600_hdmi_setmode,
}, },
.copy = { .copy = {
.blit = &r600_copy_cpdma, .blit = &r600_copy_cpdma,
@ -1022,7 +1019,6 @@ static struct radeon_asic rv6xx_asic = {
.set_backlight_level = &atombios_set_backlight_level, .set_backlight_level = &atombios_set_backlight_level,
.get_backlight_level = &atombios_get_backlight_level, .get_backlight_level = &atombios_get_backlight_level,
.hdmi_enable = &r600_hdmi_enable, .hdmi_enable = &r600_hdmi_enable,
.hdmi_setmode = &r600_hdmi_setmode,
}, },
.copy = { .copy = {
.blit = &r600_copy_cpdma, .blit = &r600_copy_cpdma,
@ -1113,7 +1109,6 @@ static struct radeon_asic rs780_asic = {
.set_backlight_level = &atombios_set_backlight_level, .set_backlight_level = &atombios_set_backlight_level,
.get_backlight_level = &atombios_get_backlight_level, .get_backlight_level = &atombios_get_backlight_level,
.hdmi_enable = &r600_hdmi_enable, .hdmi_enable = &r600_hdmi_enable,
.hdmi_setmode = &r600_hdmi_setmode,
}, },
.copy = { .copy = {
.blit = &r600_copy_cpdma, .blit = &r600_copy_cpdma,
@ -1217,7 +1212,6 @@ static struct radeon_asic rv770_asic = {
.set_backlight_level = &atombios_set_backlight_level, .set_backlight_level = &atombios_set_backlight_level,
.get_backlight_level = &atombios_get_backlight_level, .get_backlight_level = &atombios_get_backlight_level,
.hdmi_enable = &r600_hdmi_enable, .hdmi_enable = &r600_hdmi_enable,
.hdmi_setmode = &dce3_1_hdmi_setmode,
}, },
.copy = { .copy = {
.blit = &r600_copy_cpdma, .blit = &r600_copy_cpdma,
@ -1335,7 +1329,6 @@ static struct radeon_asic evergreen_asic = {
.set_backlight_level = &atombios_set_backlight_level, .set_backlight_level = &atombios_set_backlight_level,
.get_backlight_level = &atombios_get_backlight_level, .get_backlight_level = &atombios_get_backlight_level,
.hdmi_enable = &evergreen_hdmi_enable, .hdmi_enable = &evergreen_hdmi_enable,
.hdmi_setmode = &evergreen_hdmi_setmode,
}, },
.copy = { .copy = {
.blit = &r600_copy_cpdma, .blit = &r600_copy_cpdma,
@ -1427,7 +1420,6 @@ static struct radeon_asic sumo_asic = {
.set_backlight_level = &atombios_set_backlight_level, .set_backlight_level = &atombios_set_backlight_level,
.get_backlight_level = &atombios_get_backlight_level, .get_backlight_level = &atombios_get_backlight_level,
.hdmi_enable = &evergreen_hdmi_enable, .hdmi_enable = &evergreen_hdmi_enable,
.hdmi_setmode = &evergreen_hdmi_setmode,
}, },
.copy = { .copy = {
.blit = &r600_copy_cpdma, .blit = &r600_copy_cpdma,
@ -1518,7 +1510,6 @@ static struct radeon_asic btc_asic = {
.set_backlight_level = &atombios_set_backlight_level, .set_backlight_level = &atombios_set_backlight_level,
.get_backlight_level = &atombios_get_backlight_level, .get_backlight_level = &atombios_get_backlight_level,
.hdmi_enable = &evergreen_hdmi_enable, .hdmi_enable = &evergreen_hdmi_enable,
.hdmi_setmode = &evergreen_hdmi_setmode,
}, },
.copy = { .copy = {
.blit = &r600_copy_cpdma, .blit = &r600_copy_cpdma,
@ -1664,7 +1655,6 @@ static struct radeon_asic cayman_asic = {
.set_backlight_level = &atombios_set_backlight_level, .set_backlight_level = &atombios_set_backlight_level,
.get_backlight_level = &atombios_get_backlight_level, .get_backlight_level = &atombios_get_backlight_level,
.hdmi_enable = &evergreen_hdmi_enable, .hdmi_enable = &evergreen_hdmi_enable,
.hdmi_setmode = &evergreen_hdmi_setmode,
}, },
.copy = { .copy = {
.blit = &r600_copy_cpdma, .blit = &r600_copy_cpdma,
@ -1767,7 +1757,6 @@ static struct radeon_asic trinity_asic = {
.set_backlight_level = &atombios_set_backlight_level, .set_backlight_level = &atombios_set_backlight_level,
.get_backlight_level = &atombios_get_backlight_level, .get_backlight_level = &atombios_get_backlight_level,
.hdmi_enable = &evergreen_hdmi_enable, .hdmi_enable = &evergreen_hdmi_enable,
.hdmi_setmode = &evergreen_hdmi_setmode,
}, },
.copy = { .copy = {
.blit = &r600_copy_cpdma, .blit = &r600_copy_cpdma,
@ -1900,7 +1889,6 @@ static struct radeon_asic si_asic = {
.set_backlight_level = &atombios_set_backlight_level, .set_backlight_level = &atombios_set_backlight_level,
.get_backlight_level = &atombios_get_backlight_level, .get_backlight_level = &atombios_get_backlight_level,
.hdmi_enable = &evergreen_hdmi_enable, .hdmi_enable = &evergreen_hdmi_enable,
.hdmi_setmode = &evergreen_hdmi_setmode,
}, },
.copy = { .copy = {
.blit = &r600_copy_cpdma, .blit = &r600_copy_cpdma,
@ -2067,7 +2055,6 @@ static struct radeon_asic ci_asic = {
.set_backlight_level = &atombios_set_backlight_level, .set_backlight_level = &atombios_set_backlight_level,
.get_backlight_level = &atombios_get_backlight_level, .get_backlight_level = &atombios_get_backlight_level,
.hdmi_enable = &evergreen_hdmi_enable, .hdmi_enable = &evergreen_hdmi_enable,
.hdmi_setmode = &evergreen_hdmi_setmode,
}, },
.copy = { .copy = {
.blit = &cik_copy_cpdma, .blit = &cik_copy_cpdma,
@ -2178,7 +2165,6 @@ static struct radeon_asic kv_asic = {
.set_backlight_level = &atombios_set_backlight_level, .set_backlight_level = &atombios_set_backlight_level,
.get_backlight_level = &atombios_get_backlight_level, .get_backlight_level = &atombios_get_backlight_level,
.hdmi_enable = &evergreen_hdmi_enable, .hdmi_enable = &evergreen_hdmi_enable,
.hdmi_setmode = &evergreen_hdmi_setmode,
}, },
.copy = { .copy = {
.blit = &cik_copy_cpdma, .blit = &cik_copy_cpdma,

4
drivers/gpu/drm/radeon/radeon_asic.h
View File

@ -399,7 +399,6 @@ void r600_hdmi_audio_workaround(struct drm_encoder *encoder);
int r600_hdmi_buffer_status_changed(struct drm_encoder *encoder); int r600_hdmi_buffer_status_changed(struct drm_encoder *encoder);
void r600_hdmi_update_audio_settings(struct drm_encoder *encoder); void r600_hdmi_update_audio_settings(struct drm_encoder *encoder);
void r600_hdmi_enable(struct drm_encoder *encoder, bool enable); void r600_hdmi_enable(struct drm_encoder *encoder, bool enable);
void r600_hdmi_setmode(struct drm_encoder *encoder, struct drm_display_mode *mode);
int r600_mc_wait_for_idle(struct radeon_device *rdev); int r600_mc_wait_for_idle(struct radeon_device *rdev);
u32 r600_get_xclk(struct radeon_device *rdev); u32 r600_get_xclk(struct radeon_device *rdev);
uint64_t r600_get_gpu_clock_counter(struct radeon_device *rdev); uint64_t r600_get_gpu_clock_counter(struct radeon_device *rdev);
@ -468,8 +467,6 @@ struct radeon_fence *rv770_copy_dma(struct radeon_device *rdev,
u32 rv770_get_xclk(struct radeon_device *rdev); u32 rv770_get_xclk(struct radeon_device *rdev);
int rv770_set_uvd_clocks(struct radeon_device *rdev, u32 vclk, u32 dclk); int rv770_set_uvd_clocks(struct radeon_device *rdev, u32 vclk, u32 dclk);
int rv770_get_temp(struct radeon_device *rdev); int rv770_get_temp(struct radeon_device *rdev);
/* hdmi */
void dce3_1_hdmi_setmode(struct drm_encoder *encoder, struct drm_display_mode *mode);
/* rv7xx pm */ /* rv7xx pm */
int rv770_dpm_init(struct radeon_device *rdev); int rv770_dpm_init(struct radeon_device *rdev);
int rv770_dpm_enable(struct radeon_device *rdev); int rv770_dpm_enable(struct radeon_device *rdev);
@ -540,7 +537,6 @@ struct radeon_fence *evergreen_copy_dma(struct radeon_device *rdev,
unsigned num_gpu_pages, unsigned num_gpu_pages,
struct reservation_object *resv); struct reservation_object *resv);
void evergreen_hdmi_enable(struct drm_encoder *encoder, bool enable); void evergreen_hdmi_enable(struct drm_encoder *encoder, bool enable);
void evergreen_hdmi_setmode(struct drm_encoder *encoder, struct drm_display_mode *mode);
int evergreen_get_temp(struct radeon_device *rdev); int evergreen_get_temp(struct radeon_device *rdev);
int sumo_get_temp(struct radeon_device *rdev); int sumo_get_temp(struct radeon_device *rdev);
int tn_get_temp(struct radeon_device *rdev); int tn_get_temp(struct radeon_device *rdev);

72
drivers/gpu/drm/radeon/radeon_audio.c
View File

@ -95,6 +95,8 @@ void dce4_set_audio_packet(struct drm_encoder *encoder, u32 offset);
void r600_set_mute(struct drm_encoder *encoder, u32 offset, bool mute); void r600_set_mute(struct drm_encoder *encoder, u32 offset, bool mute);
void dce3_2_set_mute(struct drm_encoder *encoder, u32 offset, bool mute); void dce3_2_set_mute(struct drm_encoder *encoder, u32 offset, bool mute);
void dce4_set_mute(struct drm_encoder *encoder, u32 offset, bool mute); void dce4_set_mute(struct drm_encoder *encoder, u32 offset, bool mute);
static void radeon_audio_hdmi_mode_set(struct drm_encoder *encoder,
struct drm_display_mode *mode);
static const u32 pin_offsets[7] = static const u32 pin_offsets[7] =
{ {
@ -150,6 +152,7 @@ static struct radeon_audio_funcs r600_hdmi_funcs = {
.set_avi_packet = r600_set_avi_packet, .set_avi_packet = r600_set_avi_packet,
.set_audio_packet = r600_set_audio_packet, .set_audio_packet = r600_set_audio_packet,
.set_mute = r600_set_mute, .set_mute = r600_set_mute,
.mode_set = radeon_audio_hdmi_mode_set,
}; };
static struct radeon_audio_funcs dce32_hdmi_funcs = { static struct radeon_audio_funcs dce32_hdmi_funcs = {
@ -162,6 +165,7 @@ static struct radeon_audio_funcs dce32_hdmi_funcs = {
.set_avi_packet = r600_set_avi_packet, .set_avi_packet = r600_set_avi_packet,
.set_audio_packet = dce3_2_set_audio_packet, .set_audio_packet = dce3_2_set_audio_packet,
.set_mute = dce3_2_set_mute, .set_mute = dce3_2_set_mute,
.mode_set = radeon_audio_hdmi_mode_set,
}; };
static struct radeon_audio_funcs dce32_dp_funcs = { static struct radeon_audio_funcs dce32_dp_funcs = {
@ -184,6 +188,7 @@ static struct radeon_audio_funcs dce4_hdmi_funcs = {
.set_avi_packet = evergreen_set_avi_packet, .set_avi_packet = evergreen_set_avi_packet,
.set_audio_packet = dce4_set_audio_packet, .set_audio_packet = dce4_set_audio_packet,
.set_mute = dce4_set_mute, .set_mute = dce4_set_mute,
.mode_set = radeon_audio_hdmi_mode_set,
}; };
static struct radeon_audio_funcs dce4_dp_funcs = { static struct radeon_audio_funcs dce4_dp_funcs = {
@ -208,6 +213,7 @@ static struct radeon_audio_funcs dce6_hdmi_funcs = {
.set_avi_packet = evergreen_set_avi_packet, .set_avi_packet = evergreen_set_avi_packet,
.set_audio_packet = dce4_set_audio_packet, .set_audio_packet = dce4_set_audio_packet,
.set_mute = dce4_set_mute, .set_mute = dce4_set_mute,
.mode_set = radeon_audio_hdmi_mode_set,
}; };
static struct radeon_audio_funcs dce6_dp_funcs = { static struct radeon_audio_funcs dce6_dp_funcs = {
@ -337,7 +343,7 @@ void radeon_audio_endpoint_wreg(struct radeon_device *rdev, u32 offset,
rdev->audio.funcs->endpoint_wreg(rdev, offset, reg, v); rdev->audio.funcs->endpoint_wreg(rdev, offset, reg, v);
} }
void radeon_audio_write_sad_regs(struct drm_encoder *encoder) static void radeon_audio_write_sad_regs(struct drm_encoder *encoder)
{ {
struct radeon_encoder *radeon_encoder; struct radeon_encoder *radeon_encoder;
struct drm_connector *connector; struct drm_connector *connector;
@ -373,7 +379,7 @@ void radeon_audio_write_sad_regs(struct drm_encoder *encoder)
kfree(sads); kfree(sads);
} }
void radeon_audio_write_speaker_allocation(struct drm_encoder *encoder) static void radeon_audio_write_speaker_allocation(struct drm_encoder *encoder)
{ {
struct radeon_encoder *radeon_encoder = to_radeon_encoder(encoder); struct radeon_encoder *radeon_encoder = to_radeon_encoder(encoder);
struct drm_connector *connector; struct drm_connector *connector;
@ -408,7 +414,7 @@ void radeon_audio_write_speaker_allocation(struct drm_encoder *encoder)
kfree(sadb); kfree(sadb);
} }
void radeon_audio_write_latency_fields(struct drm_encoder *encoder, static void radeon_audio_write_latency_fields(struct drm_encoder *encoder,
struct drm_display_mode *mode) struct drm_display_mode *mode)
{ {
struct radeon_encoder *radeon_encoder; struct radeon_encoder *radeon_encoder;
@ -445,7 +451,7 @@ struct r600_audio_pin* radeon_audio_get_pin(struct drm_encoder *encoder)
return NULL; return NULL;
} }
void radeon_audio_select_pin(struct drm_encoder *encoder) static void radeon_audio_select_pin(struct drm_encoder *encoder)
{ {
struct radeon_encoder *radeon_encoder = to_radeon_encoder(encoder); struct radeon_encoder *radeon_encoder = to_radeon_encoder(encoder);
@ -473,7 +479,7 @@ void radeon_audio_fini(struct radeon_device *rdev)
rdev->audio.enabled = false; rdev->audio.enabled = false;
} }
void radeon_audio_set_dto(struct drm_encoder *encoder, unsigned int clock) static void radeon_audio_set_dto(struct drm_encoder *encoder, unsigned int clock)
{ {
struct radeon_device *rdev = encoder->dev->dev_private; struct radeon_device *rdev = encoder->dev->dev_private;
struct radeon_encoder *radeon_encoder = to_radeon_encoder(encoder); struct radeon_encoder *radeon_encoder = to_radeon_encoder(encoder);
@ -483,7 +489,7 @@ void radeon_audio_set_dto(struct drm_encoder *encoder, unsigned int clock)
radeon_encoder->audio->set_dto(rdev, crtc, clock); radeon_encoder->audio->set_dto(rdev, crtc, clock);
} }
int radeon_audio_set_avi_packet(struct drm_encoder *encoder, static int radeon_audio_set_avi_packet(struct drm_encoder *encoder,
struct drm_display_mode *mode) struct drm_display_mode *mode)
{ {
struct radeon_device *rdev = encoder->dev->dev_private; struct radeon_device *rdev = encoder->dev->dev_private;
@ -589,7 +595,7 @@ static const struct radeon_hdmi_acr* radeon_audio_acr(unsigned int clock)
/* /*
* update the N and CTS parameters for a given pixel clock rate * update the N and CTS parameters for a given pixel clock rate
*/ */
void radeon_audio_update_acr(struct drm_encoder *encoder, unsigned int clock) static void radeon_audio_update_acr(struct drm_encoder *encoder, unsigned int clock)
{ {
const struct radeon_hdmi_acr *acr = radeon_audio_acr(clock); const struct radeon_hdmi_acr *acr = radeon_audio_acr(clock);
struct radeon_encoder *radeon_encoder = to_radeon_encoder(encoder); struct radeon_encoder *radeon_encoder = to_radeon_encoder(encoder);
@ -602,7 +608,7 @@ void radeon_audio_update_acr(struct drm_encoder *encoder, unsigned int clock)
radeon_encoder->audio->update_acr(encoder, dig->afmt->offset, acr); radeon_encoder->audio->update_acr(encoder, dig->afmt->offset, acr);
} }
void radeon_audio_set_vbi_packet(struct drm_encoder *encoder) static void radeon_audio_set_vbi_packet(struct drm_encoder *encoder)
{ {
struct radeon_encoder *radeon_encoder = to_radeon_encoder(encoder); struct radeon_encoder *radeon_encoder = to_radeon_encoder(encoder);
struct radeon_encoder_atom_dig *dig = radeon_encoder->enc_priv; struct radeon_encoder_atom_dig *dig = radeon_encoder->enc_priv;
@ -614,7 +620,7 @@ void radeon_audio_set_vbi_packet(struct drm_encoder *encoder)
radeon_encoder->audio->set_vbi_packet(encoder, dig->afmt->offset); radeon_encoder->audio->set_vbi_packet(encoder, dig->afmt->offset);
} }
void radeon_hdmi_set_color_depth(struct drm_encoder *encoder) static void radeon_hdmi_set_color_depth(struct drm_encoder *encoder)
{ {
int bpc = 8; int bpc = 8;
struct radeon_encoder *radeon_encoder = to_radeon_encoder(encoder); struct radeon_encoder *radeon_encoder = to_radeon_encoder(encoder);
@ -632,7 +638,7 @@ void radeon_hdmi_set_color_depth(struct drm_encoder *encoder)
radeon_encoder->audio->set_color_depth(encoder, dig->afmt->offset, bpc); radeon_encoder->audio->set_color_depth(encoder, dig->afmt->offset, bpc);
} }
void radeon_audio_set_audio_packet(struct drm_encoder *encoder) static void radeon_audio_set_audio_packet(struct drm_encoder *encoder)
{ {
struct radeon_encoder *radeon_encoder = to_radeon_encoder(encoder); struct radeon_encoder *radeon_encoder = to_radeon_encoder(encoder);
struct radeon_encoder_atom_dig *dig = radeon_encoder->enc_priv; struct radeon_encoder_atom_dig *dig = radeon_encoder->enc_priv;
@ -644,7 +650,7 @@ void radeon_audio_set_audio_packet(struct drm_encoder *encoder)
radeon_encoder->audio->set_audio_packet(encoder, dig->afmt->offset); radeon_encoder->audio->set_audio_packet(encoder, dig->afmt->offset);
} }
void radeon_audio_set_mute(struct drm_encoder *encoder, bool mute) static void radeon_audio_set_mute(struct drm_encoder *encoder, bool mute)
{ {
struct radeon_encoder *radeon_encoder = to_radeon_encoder(encoder); struct radeon_encoder *radeon_encoder = to_radeon_encoder(encoder);
struct radeon_encoder_atom_dig *dig = radeon_encoder->enc_priv; struct radeon_encoder_atom_dig *dig = radeon_encoder->enc_priv;
@ -655,3 +661,47 @@ void radeon_audio_set_mute(struct drm_encoder *encoder, bool mute)
if (radeon_encoder->audio && radeon_encoder->audio->set_mute) if (radeon_encoder->audio && radeon_encoder->audio->set_mute)
radeon_encoder->audio->set_mute(encoder, dig->afmt->offset, mute); radeon_encoder->audio->set_mute(encoder, dig->afmt->offset, mute);
} }
/*
* update the info frames with the data from the current display mode
*/
static void radeon_audio_hdmi_mode_set(struct drm_encoder *encoder,
struct drm_display_mode *mode)
{
struct radeon_device *rdev = encoder->dev->dev_private;
struct radeon_encoder *radeon_encoder = to_radeon_encoder(encoder);
struct radeon_encoder_atom_dig *dig = radeon_encoder->enc_priv;
if (!dig || !dig->afmt)
return;
/* disable audio prior to setting up hw */
dig->afmt->pin = radeon_audio_get_pin(encoder);
radeon_audio_enable(rdev, dig->afmt->pin, 0);
radeon_audio_set_dto(encoder, mode->clock);
radeon_audio_set_vbi_packet(encoder);
radeon_hdmi_set_color_depth(encoder);
radeon_audio_set_mute(encoder, false);
radeon_audio_update_acr(encoder, mode->clock);
radeon_audio_write_speaker_allocation(encoder);
radeon_audio_set_audio_packet(encoder);
radeon_audio_select_pin(encoder);
radeon_audio_write_sad_regs(encoder);
radeon_audio_write_latency_fields(encoder, mode);
if (radeon_audio_set_avi_packet(encoder, mode) < 0)
return;
/* enable audio after to setting up hw */
radeon_audio_enable(rdev, dig->afmt->pin, 0xf);
}
void radeon_audio_mode_set(struct drm_encoder *encoder,
struct drm_display_mode *mode)
{
struct radeon_encoder *radeon_encoder = to_radeon_encoder(encoder);
if (radeon_encoder->audio && radeon_encoder->audio->mode_set)
radeon_encoder->audio->mode_set(encoder, mode);
}

15
drivers/gpu/drm/radeon/radeon_audio.h
View File

@ -61,6 +61,8 @@ struct radeon_audio_funcs
unsigned char *buffer, size_t size); unsigned char *buffer, size_t size);
void (*set_audio_packet)(struct drm_encoder *encoder, u32 offset); void (*set_audio_packet)(struct drm_encoder *encoder, u32 offset);
void (*set_mute)(struct drm_encoder *encoder, u32 offset, bool mute); void (*set_mute)(struct drm_encoder *encoder, u32 offset, bool mute);
void (*mode_set)(struct drm_encoder *encoder,
struct drm_display_mode *mode);
}; };
int radeon_audio_init(struct radeon_device *rdev); int radeon_audio_init(struct radeon_device *rdev);
@ -70,22 +72,11 @@ u32 radeon_audio_endpoint_rreg(struct radeon_device *rdev,
u32 offset, u32 reg); u32 offset, u32 reg);
void radeon_audio_endpoint_wreg(struct radeon_device *rdev, void radeon_audio_endpoint_wreg(struct radeon_device *rdev,
u32 offset, u32 reg, u32 v); u32 offset, u32 reg, u32 v);
void radeon_audio_write_sad_regs(struct drm_encoder *encoder);
void radeon_audio_write_speaker_allocation(struct drm_encoder *encoder);
void radeon_audio_write_latency_fields(struct drm_encoder *encoder,
struct drm_display_mode *mode);
struct r600_audio_pin *radeon_audio_get_pin(struct drm_encoder *encoder); struct r600_audio_pin *radeon_audio_get_pin(struct drm_encoder *encoder);
void radeon_audio_select_pin(struct drm_encoder *encoder);
void radeon_audio_enable(struct radeon_device *rdev, void radeon_audio_enable(struct radeon_device *rdev,
struct r600_audio_pin *pin, u8 enable_mask); struct r600_audio_pin *pin, u8 enable_mask);
void radeon_audio_fini(struct radeon_device *rdev); void radeon_audio_fini(struct radeon_device *rdev);
void radeon_audio_set_dto(struct drm_encoder *encoder, unsigned int clock); void radeon_audio_mode_set(struct drm_encoder *encoder,
int radeon_audio_set_avi_packet(struct drm_encoder *encoder,
struct drm_display_mode *mode); struct drm_display_mode *mode);
void radeon_audio_update_acr(struct drm_encoder *encoder, unsigned int clock);
void radeon_audio_set_vbi_packet(struct drm_encoder *encoder);
void radeon_hdmi_set_color_depth(struct drm_encoder *encoder);
void radeon_audio_set_audio_packet(struct drm_encoder *encoder);
void radeon_audio_set_mute(struct drm_encoder *encoder, bool mute);
#endif #endif