Skip to content

L
linux
Commit 87654f87 authored by Slava Grigorev's avatar Slava Grigorev Committed by Alex Deucher
Browse files
Options

radeon/audio: consolidate write_latency_fields() functions 

Signed-off-by: default avatarSlava Grigorev <slava.grigorev@amd.com>
Signed-off-by: default avatarAlex Deucher <alexander.deucher@amd.com>
parent 00a9d4bc
Hide whitespace changes
Inline Side-by-side
Showing with 44 additions and 39 deletions
drivers/gpu/drm/radeon/dce6_afmt.c
View file @ 87654f87
...@@ -102,13 +102,11 @@ void dce6_afmt_select_pin(struct drm_encoder *encoder) ...@@ -102,13 +102,11 @@ void dce6_afmt_select_pin(struct drm_encoder *encoder)
} }
void dce6_afmt_write_latency_fields(struct drm_encoder *encoder, void dce6_afmt_write_latency_fields(struct drm_encoder *encoder,
struct drm_display_mode *mode) struct drm_connector *connector, struct drm_display_mode *mode)
{ {
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);
struct radeon_encoder_atom_dig *dig = radeon_encoder->enc_priv; struct radeon_encoder_atom_dig *dig = radeon_encoder->enc_priv;
struct drm_connector *connector;
struct radeon_connector *radeon_connector = NULL;
u32 tmp = 0, offset; u32 tmp = 0, offset;
if (!dig || !dig->afmt || !dig->afmt->pin) if (!dig || !dig->afmt || !dig->afmt->pin)
...@@ -116,18 +114,6 @@ void dce6_afmt_write_latency_fields(struct drm_encoder *encoder, ...@@ -116,18 +114,6 @@ void dce6_afmt_write_latency_fields(struct drm_encoder *encoder,
offset = dig->afmt->pin->offset; offset = dig->afmt->pin->offset;
list_for_each_entry(connector, &encoder->dev->mode_config.connector_list, head) {
if (connector->encoder == encoder) {
radeon_connector = to_radeon_connector(connector);
break;
}
}
if (!radeon_connector) {
DRM_ERROR("Couldn't find encoder's connector\n");
return;
}
if (mode->flags & DRM_MODE_FLAG_INTERLACE) { if (mode->flags & DRM_MODE_FLAG_INTERLACE) {
if (connector->latency_present[1]) if (connector->latency_present[1])
tmp = VIDEO_LIPSYNC(connector->video_latency[1]) | tmp = VIDEO_LIPSYNC(connector->video_latency[1]) |
......
drivers/gpu/drm/radeon/evergreen_hdmi.c
View file @ 87654f87
...@@ -34,8 +34,6 @@ ...@@ -34,8 +34,6 @@
#include "atom.h" #include "atom.h"
extern void dce6_afmt_select_pin(struct drm_encoder *encoder); extern void dce6_afmt_select_pin(struct drm_encoder *encoder);
extern void dce6_afmt_write_latency_fields(struct drm_encoder *encoder,
struct drm_display_mode *mode);
/* enable the audio stream */ /* enable the audio stream */
static void dce4_audio_enable(struct radeon_device *rdev, static void dce4_audio_enable(struct radeon_device *rdev,
...@@ -90,26 +88,12 @@ static void evergreen_hdmi_update_ACR(struct drm_encoder *encoder, uint32_t cloc ...@@ -90,26 +88,12 @@ static void evergreen_hdmi_update_ACR(struct drm_encoder *encoder, uint32_t cloc
WREG32(HDMI_ACR_48_1 + offset, acr.n_48khz); WREG32(HDMI_ACR_48_1 + offset, acr.n_48khz);
} }
static void dce4_afmt_write_latency_fields(struct drm_encoder *encoder, void dce4_afmt_write_latency_fields(struct drm_encoder *encoder,
struct drm_display_mode *mode) struct drm_connector *connector, struct drm_display_mode *mode)
{ {
struct radeon_device *rdev = encoder->dev->dev_private; struct radeon_device *rdev = encoder->dev->dev_private;
struct drm_connector *connector;
struct radeon_connector *radeon_connector = NULL;
u32 tmp = 0; u32 tmp = 0;
list_for_each_entry(connector, &encoder->dev->mode_config.connector_list, head) {
if (connector->encoder == encoder) {
radeon_connector = to_radeon_connector(connector);
break;
}
}
if (!radeon_connector) {
DRM_ERROR("Couldn't find encoder's connector\n");
return;
}
if (mode->flags & DRM_MODE_FLAG_INTERLACE) { if (mode->flags & DRM_MODE_FLAG_INTERLACE) {
if (connector->latency_present[1]) if (connector->latency_present[1])
tmp = VIDEO_LIPSYNC(connector->video_latency[1]) | tmp = VIDEO_LIPSYNC(connector->video_latency[1]) |
...@@ -123,7 +107,7 @@ static void dce4_afmt_write_latency_fields(struct drm_encoder *encoder, ...@@ -123,7 +107,7 @@ static void dce4_afmt_write_latency_fields(struct drm_encoder *encoder,
else else
tmp = VIDEO_LIPSYNC(255) | AUDIO_LIPSYNC(255); tmp = VIDEO_LIPSYNC(255) | AUDIO_LIPSYNC(255);
} }
WREG32(AZ_F0_CODEC_PIN0_CONTROL_RESPONSE_LIPSYNC, tmp); WREG32_ENDPOINT(0, AZ_F0_CODEC_PIN0_CONTROL_RESPONSE_LIPSYNC, tmp);
} }
void dce4_afmt_hdmi_write_speaker_allocation(struct drm_encoder *encoder, void dce4_afmt_hdmi_write_speaker_allocation(struct drm_encoder *encoder,
...@@ -418,14 +402,11 @@ void evergreen_hdmi_setmode(struct drm_encoder *encoder, struct drm_display_mode ...@@ -418,14 +402,11 @@ void evergreen_hdmi_setmode(struct drm_encoder *encoder, struct drm_display_mode
/* fglrx sets 0x40 in 0x5f80 here */ /* fglrx sets 0x40 in 0x5f80 here */
if (ASIC_IS_DCE6(rdev)) { if (ASIC_IS_DCE6(rdev))
dce6_afmt_select_pin(encoder); dce6_afmt_select_pin(encoder);
dce6_afmt_write_latency_fields(encoder, mode);
} else {
dce4_afmt_write_latency_fields(encoder, mode);
}
radeon_audio_write_sad_regs(encoder); radeon_audio_write_sad_regs(encoder);
radeon_audio_write_latency_fields(encoder, mode);
err = drm_hdmi_avi_infoframe_from_display_mode(&frame, mode); err = drm_hdmi_avi_infoframe_from_display_mode(&frame, mode);
if (err < 0) { if (err < 0) {
......
drivers/gpu/drm/radeon/radeon_audio.c
View file @ 87654f87
...@@ -53,6 +53,10 @@ void dce6_afmt_hdmi_write_speaker_allocation(struct drm_encoder *encoder, ...@@ -53,6 +53,10 @@ void dce6_afmt_hdmi_write_speaker_allocation(struct drm_encoder *encoder,
u8 *sadb, int sad_count); u8 *sadb, int sad_count);
void dce6_afmt_dp_write_speaker_allocation(struct drm_encoder *encoder, void dce6_afmt_dp_write_speaker_allocation(struct drm_encoder *encoder,
u8 *sadb, int sad_count); u8 *sadb, int sad_count);
void dce4_afmt_write_latency_fields(struct drm_encoder *encoder,
struct drm_connector *connector, struct drm_display_mode *mode);
void dce6_afmt_write_latency_fields(struct drm_encoder *encoder,
struct drm_connector *connector, struct drm_display_mode *mode);
static const u32 pin_offsets[7] = static const u32 pin_offsets[7] =
{ {
...@@ -104,21 +108,25 @@ static struct radeon_audio_funcs dce32_dp_funcs = { ...@@ -104,21 +108,25 @@ static struct radeon_audio_funcs dce32_dp_funcs = {
static struct radeon_audio_funcs dce4_hdmi_funcs = { static struct radeon_audio_funcs dce4_hdmi_funcs = {
.write_sad_regs = evergreen_hdmi_write_sad_regs, .write_sad_regs = evergreen_hdmi_write_sad_regs,
.write_speaker_allocation = dce4_afmt_hdmi_write_speaker_allocation, .write_speaker_allocation = dce4_afmt_hdmi_write_speaker_allocation,
.write_latency_fields = dce4_afmt_write_latency_fields,
}; };
static struct radeon_audio_funcs dce4_dp_funcs = { static struct radeon_audio_funcs dce4_dp_funcs = {
.write_sad_regs = evergreen_hdmi_write_sad_regs, .write_sad_regs = evergreen_hdmi_write_sad_regs,
.write_speaker_allocation = dce4_afmt_dp_write_speaker_allocation, .write_speaker_allocation = dce4_afmt_dp_write_speaker_allocation,
.write_latency_fields = dce4_afmt_write_latency_fields,
}; };
static struct radeon_audio_funcs dce6_hdmi_funcs = { static struct radeon_audio_funcs dce6_hdmi_funcs = {
.write_sad_regs = dce6_afmt_write_sad_regs, .write_sad_regs = dce6_afmt_write_sad_regs,
.write_speaker_allocation = dce6_afmt_hdmi_write_speaker_allocation, .write_speaker_allocation = dce6_afmt_hdmi_write_speaker_allocation,
.write_latency_fields = dce6_afmt_write_latency_fields,
}; };
static struct radeon_audio_funcs dce6_dp_funcs = { static struct radeon_audio_funcs dce6_dp_funcs = {
.write_sad_regs = dce6_afmt_write_sad_regs, .write_sad_regs = dce6_afmt_write_sad_regs,
.write_speaker_allocation = dce6_afmt_dp_write_speaker_allocation, .write_speaker_allocation = dce6_afmt_dp_write_speaker_allocation,
.write_latency_fields = dce6_afmt_write_latency_fields,
}; };
static void radeon_audio_interface_init(struct radeon_device *rdev) static void radeon_audio_interface_init(struct radeon_device *rdev)
...@@ -307,3 +315,29 @@ void radeon_audio_write_speaker_allocation(struct drm_encoder *encoder) ...@@ -307,3 +315,29 @@ void radeon_audio_write_speaker_allocation(struct drm_encoder *encoder)
kfree(sadb); kfree(sadb);
} }
void radeon_audio_write_latency_fields(struct drm_encoder *encoder,
struct drm_display_mode *mode)
{
struct radeon_encoder *radeon_encoder;
struct drm_connector *connector;
struct radeon_connector *radeon_connector = 0;
list_for_each_entry(connector,
&encoder->dev->mode_config.connector_list, head) {
if (connector->encoder == encoder) {
radeon_connector = to_radeon_connector(connector);
break;
}
}
if (!radeon_connector) {
DRM_ERROR("Couldn't find encoder's connector\n");
return;
}
radeon_encoder = to_radeon_encoder(encoder);
if (radeon_encoder->audio && radeon_encoder->audio->write_latency_fields)
radeon_encoder->audio->write_latency_fields(encoder, connector, mode);
}
drivers/gpu/drm/radeon/radeon_audio.h
View file @ 87654f87
...@@ -41,6 +41,8 @@ struct radeon_audio_basic_funcs ...@@ -41,6 +41,8 @@ struct radeon_audio_basic_funcs
struct radeon_audio_funcs struct radeon_audio_funcs
{ {
void (*write_latency_fields)(struct drm_encoder *encoder,
struct drm_connector *connector, struct drm_display_mode *mode);
void (*write_sad_regs)(struct drm_encoder *encoder, void (*write_sad_regs)(struct drm_encoder *encoder,
struct cea_sad *sads, int sad_count); struct cea_sad *sads, int sad_count);
void (*write_speaker_allocation)(struct drm_encoder *encoder, void (*write_speaker_allocation)(struct drm_encoder *encoder,
...@@ -56,5 +58,7 @@ void radeon_audio_endpoint_wreg(struct radeon_device *rdev, ...@@ -56,5 +58,7 @@ 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_sad_regs(struct drm_encoder *encoder);
void radeon_audio_write_speaker_allocation(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);
#endif #endif
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7