Skip to content

L
linux
Commit 87b58768 authored by Charlene Liu's avatar Charlene Liu Committed by Alex Deucher
Browse files
Options

drm/amd/display: audio bug fix part 1: Add missing audio ACR 

Signed-off-by: default avatarCharlene Liu <charlene.liu@amd.com>
Reviewed-by: default avatarTony Cheng <Tony.Cheng@amd.com>
Acked-by: default avatarHarry Wentland <Harry.Wentland@amd.com>
Signed-off-by: default avatarAlex Deucher <alexander.deucher@amd.com>
parent 185189dc
Hide whitespace changes
Inline Side-by-side
Showing with 95 additions and 30 deletions
drivers/gpu/drm/amd/display/dc/dce/dce_audio.c
View file @ 87b58768
...@@ -828,11 +828,9 @@ void dce_aud_wall_dto_setup( ...@@ -828,11 +828,9 @@ void dce_aud_wall_dto_setup(
REG_UPDATE(DCCG_AUDIO_DTO1_PHASE, REG_UPDATE(DCCG_AUDIO_DTO1_PHASE,
DCCG_AUDIO_DTO1_PHASE, clock_info.audio_dto_phase); DCCG_AUDIO_DTO1_PHASE, clock_info.audio_dto_phase);
/* DAL2 code separate DCCG_AUDIO_DTO_SEL and REG_UPDATE(DCCG_AUDIO_DTO_SOURCE,
DCCG_AUDIO_DTO2_USE_512FBR_DTO programming into two different DCCG_AUDIO_DTO2_USE_512FBR_DTO, 1);
location. merge together should not hurt */
/*value.bits.DCCG_AUDIO_DTO2_USE_512FBR_DTO = 1;
dal_write_reg(mmDCCG_AUDIO_DTO_SOURCE, value);*/
} }
} }
......
drivers/gpu/drm/amd/display/dc/dce/dce_audio.h
View file @ 87b58768
...@@ -93,6 +93,7 @@ struct dce_audio_shift { ...@@ -93,6 +93,7 @@ struct dce_audio_shift {
uint8_t DCCG_AUDIO_DTO0_PHASE; uint8_t DCCG_AUDIO_DTO0_PHASE;
uint8_t DCCG_AUDIO_DTO1_MODULE; uint8_t DCCG_AUDIO_DTO1_MODULE;
uint8_t DCCG_AUDIO_DTO1_PHASE; uint8_t DCCG_AUDIO_DTO1_PHASE;
uint8_t DCCG_AUDIO_DTO2_USE_512FBR_DTO;
}; };
struct dce_aduio_mask { struct dce_aduio_mask {
...@@ -109,6 +110,7 @@ struct dce_aduio_mask { ...@@ -109,6 +110,7 @@ struct dce_aduio_mask {
uint32_t DCCG_AUDIO_DTO0_PHASE; uint32_t DCCG_AUDIO_DTO0_PHASE;
uint32_t DCCG_AUDIO_DTO1_MODULE; uint32_t DCCG_AUDIO_DTO1_MODULE;
uint32_t DCCG_AUDIO_DTO1_PHASE; uint32_t DCCG_AUDIO_DTO1_PHASE;
uint32_t DCCG_AUDIO_DTO2_USE_512FBR_DTO;
}; };
struct dce_audio { struct dce_audio {
......
drivers/gpu/drm/amd/display/dc/dce/dce_link_encoder.c
View file @ 87b58768
...@@ -871,6 +871,8 @@ static bool dce110_link_encoder_validate_hdmi_output( ...@@ -871,6 +871,8 @@ static bool dce110_link_encoder_validate_hdmi_output(
if (max_deep_color < crtc_timing->display_color_depth) if (max_deep_color < crtc_timing->display_color_depth)
return false; return false;
if (crtc_timing->display_color_depth < COLOR_DEPTH_888)
return false;
if (adjusted_pix_clk_khz < TMDS_MIN_PIXEL_CLOCK) if (adjusted_pix_clk_khz < TMDS_MIN_PIXEL_CLOCK)
return false; return false;
......
drivers/gpu/drm/amd/display/dc/dce/dce_stream_encoder.c
View file @ 87b58768
...@@ -848,7 +848,7 @@ struct audio_clock_info { ...@@ -848,7 +848,7 @@ struct audio_clock_info {
/* 148.5MHz/1.001*/ /* 148.5MHz/1.001*/
/* 148.5MHz*/ /* 148.5MHz*/
static const struct audio_clock_info audio_clock_info_table[12] = { static const struct audio_clock_info audio_clock_info_table[16] = {
{2517, 4576, 28125, 7007, 31250, 6864, 28125}, {2517, 4576, 28125, 7007, 31250, 6864, 28125},
{2518, 4576, 28125, 7007, 31250, 6864, 28125}, {2518, 4576, 28125, 7007, 31250, 6864, 28125},
{2520, 4096, 25200, 6272, 28000, 6144, 25200}, {2520, 4096, 25200, 6272, 28000, 6144, 25200},
...@@ -860,37 +860,63 @@ static const struct audio_clock_info audio_clock_info_table[12] = { ...@@ -860,37 +860,63 @@ static const struct audio_clock_info audio_clock_info_table[12] = {
{7417, 11648, 210937, 17836, 234375, 11648, 140625}, {7417, 11648, 210937, 17836, 234375, 11648, 140625},
{7425, 4096, 74250, 6272, 82500, 6144, 74250}, {7425, 4096, 74250, 6272, 82500, 6144, 74250},
{14835, 11648, 421875, 8918, 234375, 5824, 140625}, {14835, 11648, 421875, 8918, 234375, 5824, 140625},
{14850, 4096, 148500, 6272, 165000, 6144, 148500} {14850, 4096, 148500, 6272, 165000, 6144, 148500},
{29670, 5824, 421875, 4459, 234375, 5824, 281250},
{29700, 3072, 222750, 4704, 247500, 5120, 247500},
{59340, 5824, 843750, 8918, 937500, 5824, 562500},
{59400, 3072, 445500, 9408, 990000, 6144, 594000}
}; };
static const struct audio_clock_info audio_clock_info_table_36bpc[12] = { static const struct audio_clock_info audio_clock_info_table_30bpc[14] = {
{2517, 9152, 84375, 7007, 48875, 9152, 56250}, {2517, 9152, 70312, 14014, 78125, 9152, 46875},
{2518, 9152, 84375, 7007, 48875, 9152, 56250}, {2518, 9152, 70312, 14014, 78125, 9152, 46875},
{2520, 4096, 37800, 6272, 42000, 6144, 37800}, {2520, 4096, 31500, 6272, 35000, 6144, 31500},
{2700, 4096, 40500, 6272, 45000, 6144, 40500}, {2700, 4096, 33750, 6272, 37500, 6144, 33750},
{2702, 8192, 81081, 6272, 45045, 8192, 54054}, {2702, 8192, 67567, 12544, 75075, 8192, 45045},
{2703, 8192, 81081, 6272, 45045, 8192, 54054}, {2703, 8192, 67567, 12544, 75075, 8192, 45045},
{5400, 4096, 81000, 6272, 90000, 6144, 81000}, {5400, 4096, 67500, 6272, 75000, 6144, 67500},
{5405, 4096, 81081, 6272, 90090, 6144, 81081}, {5405, 8192, 135135, 6272, 75075, 8192, 90090},
{7417, 11648, 263672, 17836, 292969, 11648, 175181},
{7425, 8192, 185625, 6272, 103125, 12288, 185625},
{14835, 11648, 527344, 17836, 585938, 11648, 351563},
{14850, 4096, 185625, 6272, 206250, 6144, 185625},
{29670, 11648, 527344, 17836, 585938, 11648, 703125},
{29700, 6144, 556875, 4704, 309375, 5120, 309375}
};
static const struct audio_clock_info audio_clock_info_table_36bpc[14] = {
{2517, 9152, 84375, 7007, 48875, 9152, 56250},
{2518, 9152, 84375, 7007, 48875, 9152, 56250},
{2520, 4096, 37800, 6272, 42000, 6144, 37800},
{2700, 4096, 40500, 6272, 45000, 6144, 40500},
{2702, 8192, 81081, 6272, 45045, 8192, 54054},
{2703, 8192, 81081, 6272, 45045, 8192, 54054},
{5400, 4096, 81000, 6272, 90000, 6144, 81000},
{5405, 4096, 81081, 6272, 90090, 6144, 81081},
{7417, 11648, 316406, 17836, 351562, 11648, 210937}, {7417, 11648, 316406, 17836, 351562, 11648, 210937},
{7425, 4096, 111375, 6272, 123750, 6144, 111375}, {7425, 4096, 111375, 6272, 123750, 6144, 111375},
{14835, 11648, 632812, 17836, 703125, 11648, 421875}, {14835, 11648, 632812, 17836, 703125, 11648, 421875},
{14850, 4096, 222750, 6272, 247500, 6144, 222750} {14850, 4096, 222750, 6272, 247500, 6144, 222750},
{29670, 5824, 632812, 8918, 703125, 5824, 421875},
{29700, 4096, 445500, 4704, 371250, 5120, 371250}
}; };
static const struct audio_clock_info audio_clock_info_table_48bpc[12] = { static const struct audio_clock_info audio_clock_info_table_48bpc[14] = {
{2517, 4576, 56250, 7007, 62500, 6864, 56250}, {2517, 4576, 56250, 7007, 62500, 6864, 56250},
{2518, 4576, 56250, 7007, 62500, 6864, 56250}, {2518, 4576, 56250, 7007, 62500, 6864, 56250},
{2520, 4096, 50400, 6272, 56000, 6144, 50400}, {2520, 4096, 50400, 6272, 56000, 6144, 50400},
{2700, 4096, 54000, 6272, 60000, 6144, 54000}, {2700, 4096, 54000, 6272, 60000, 6144, 54000},
{2702, 4096, 54054, 6267, 60060, 8192, 54054}, {2702, 4096, 54054, 6267, 60060, 8192, 54054},
{2703, 4096, 54054, 6272, 60060, 8192, 54054}, {2703, 4096, 54054, 6272, 60060, 8192, 54054},
{5400, 4096, 108000, 6272, 120000, 6144, 108000}, {5400, 4096, 108000, 6272, 120000, 6144, 108000},
{5405, 4096, 108108, 6272, 120120, 6144, 108108}, {5405, 4096, 108108, 6272, 120120, 6144, 108108},
{7417, 11648, 421875, 17836, 468750, 11648, 281250}, {7417, 11648, 421875, 17836, 468750, 11648, 281250},
{7425, 4096, 148500, 6272, 165000, 6144, 148500}, {7425, 4096, 148500, 6272, 165000, 6144, 148500},
{14835, 11648, 843750, 8918, 468750, 11648, 281250}, {14835, 11648, 843750, 8918, 468750, 11648, 281250},
{14850, 4096, 297000, 6272, 330000, 6144, 297000} {14850, 4096, 297000, 6272, 330000, 6144, 297000},
{29670, 5824, 843750, 4459, 468750, 5824, 562500},
{29700, 3072, 445500, 4704, 495000, 5120, 495000}
}; };
union audio_cea_channels speakers_to_channels( union audio_cea_channels speakers_to_channels(
...@@ -973,6 +999,11 @@ bool get_audio_clock_info( ...@@ -973,6 +999,11 @@ bool get_audio_clock_info(
audio_array_size = ARRAY_SIZE( audio_array_size = ARRAY_SIZE(
audio_clock_info_table_36bpc); audio_clock_info_table_36bpc);
break; break;
case COLOR_DEPTH_101010:
clock_info = audio_clock_info_table_30bpc;
audio_array_size = ARRAY_SIZE(
audio_clock_info_table_30bpc);
break;
default: default:
clock_info = audio_clock_info_table; clock_info = audio_clock_info_table;
audio_array_size = ARRAY_SIZE( audio_array_size = ARRAY_SIZE(
......
drivers/gpu/drm/amd/display/dc/dce110/dce110_hw_sequencer.c
View file @ 87b58768
...@@ -868,6 +868,37 @@ static void build_audio_output( ...@@ -868,6 +868,37 @@ static void build_audio_output(
audio_output->crtc_info.calculated_pixel_clock = audio_output->crtc_info.calculated_pixel_clock =
pipe_ctx->pix_clk_params.requested_pix_clk; pipe_ctx->pix_clk_params.requested_pix_clk;
/*for HDMI, audio ACR is with deep color ratio factor*/
if (dc_is_hdmi_signal(pipe_ctx->stream->signal) &&
audio_output->crtc_info.requested_pixel_clock ==
stream->public.timing.pix_clk_khz) {
if (pipe_ctx->pix_clk_params.pixel_encoding == PIXEL_ENCODING_YCBCR420) {
audio_output->crtc_info.requested_pixel_clock =
audio_output->crtc_info.requested_pixel_clock/2;
audio_output->crtc_info.calculated_pixel_clock =
pipe_ctx->pix_clk_params.requested_pix_clk/2;
}
if (pipe_ctx->pix_clk_params.pixel_encoding != PIXEL_ENCODING_YCBCR422) {
switch (pipe_ctx->pix_clk_params.color_depth) {
case COLOR_DEPTH_888:
break;
case COLOR_DEPTH_101010:
audio_output->crtc_info.calculated_pixel_clock = (audio_output->crtc_info.calculated_pixel_clock * 30) / 24;
break;
case COLOR_DEPTH_121212:
audio_output->crtc_info.calculated_pixel_clock = (audio_output->crtc_info.calculated_pixel_clock * 36) / 24;
break;
case COLOR_DEPTH_161616:
audio_output->crtc_info.calculated_pixel_clock = (audio_output->crtc_info.calculated_pixel_clock * 48) / 24;
break;
default:
ASSERT(0);
break;
}
}
}
if (pipe_ctx->stream->signal == SIGNAL_TYPE_DISPLAY_PORT || if (pipe_ctx->stream->signal == SIGNAL_TYPE_DISPLAY_PORT ||
pipe_ctx->stream->signal == SIGNAL_TYPE_DISPLAY_PORT_MST) { pipe_ctx->stream->signal == SIGNAL_TYPE_DISPLAY_PORT_MST) {
audio_output->pll_info.dp_dto_source_clock_in_khz = audio_output->pll_info.dp_dto_source_clock_in_khz =
......
drivers/gpu/drm/amd/display/dc/dce110/dce110_resource.c
View file @ 87b58768
...@@ -776,6 +776,7 @@ static void get_pixel_clock_parameters( ...@@ -776,6 +776,7 @@ static void get_pixel_clock_parameters(
pixel_clk_params->flags.DISPLAY_BLANKED = 1; pixel_clk_params->flags.DISPLAY_BLANKED = 1;
pixel_clk_params->flags.SUPPORT_YCBCR420 = (stream->public.timing.pixel_encoding == pixel_clk_params->flags.SUPPORT_YCBCR420 = (stream->public.timing.pixel_encoding ==
PIXEL_ENCODING_YCBCR420); PIXEL_ENCODING_YCBCR420);
pixel_clk_params->pixel_encoding = stream->public.timing.pixel_encoding;
} }
void dce110_resource_build_bit_depth_reduction_params( void dce110_resource_build_bit_depth_reduction_params(
......
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