diff options
Diffstat (limited to 'meta-amd-bsp/recipes-kernel/linux/linux-yocto-4.19.8/3030-drm-amd-display-Use-Pixel-clock-in-100Hz-units-for-H.patch')
| -rw-r--r-- | meta-amd-bsp/recipes-kernel/linux/linux-yocto-4.19.8/3030-drm-amd-display-Use-Pixel-clock-in-100Hz-units-for-H.patch | 316 |
1 files changed, 316 insertions, 0 deletions
diff --git a/meta-amd-bsp/recipes-kernel/linux/linux-yocto-4.19.8/3030-drm-amd-display-Use-Pixel-clock-in-100Hz-units-for-H.patch b/meta-amd-bsp/recipes-kernel/linux/linux-yocto-4.19.8/3030-drm-amd-display-Use-Pixel-clock-in-100Hz-units-for-H.patch new file mode 100644 index 00000000..3f3dec2c --- /dev/null +++ b/meta-amd-bsp/recipes-kernel/linux/linux-yocto-4.19.8/3030-drm-amd-display-Use-Pixel-clock-in-100Hz-units-for-H.patch @@ -0,0 +1,316 @@ +From 0052bb274197e3f3e6832242f9440692f64d057c Mon Sep 17 00:00:00 2001 +From: Nevenko Stupar <Nevenko.Stupar@amd.com> +Date: Tue, 11 Jun 2019 17:35:16 -0400 +Subject: [PATCH 3030/4256] drm/amd/display:Use Pixel clock in 100Hz units for + HDMI Audio wall clock DTO + +[Why] +-Pass and use pixel clock in 100 Hz to Audio for HDMI +audio DTO for Audio wall clock programming so audio DTO gets +increased precision for timings with /1001 factor. +-For HDMI TMDS for N and CTS ACR tables are based on 10 KHz +units, these does not need to be modified as N and CTS values +are still valid using current tables. + +Signed-off-by: Nevenko Stupar <Nevenko.Stupar@amd.com> +Reviewed-by: Charlene Liu <Charlene.Liu@amd.com> +Acked-by: Leo Li <sunpeng.li@amd.com> +--- + .../gpu/drm/amd/display/dc/dce/dce_audio.c | 28 ++++++++--------- + .../amd/display/dc/dce/dce_stream_encoder.c | 30 +++++++++---------- + .../display/dc/dce110/dce110_hw_sequencer.c | 22 +++++++------- + .../display/dc/dcn10/dcn10_stream_encoder.c | 30 +++++++++---------- + .../display/dc/dcn10/dcn10_stream_encoder.h | 4 +-- + .../gpu/drm/amd/display/include/audio_types.h | 4 +-- + 6 files changed, 59 insertions(+), 59 deletions(-) + +diff --git a/drivers/gpu/drm/amd/display/dc/dce/dce_audio.c b/drivers/gpu/drm/amd/display/dc/dce/dce_audio.c +index d43d5d924c19..ad7bc7d44268 100644 +--- a/drivers/gpu/drm/amd/display/dc/dce/dce_audio.c ++++ b/drivers/gpu/drm/amd/display/dc/dce/dce_audio.c +@@ -143,20 +143,20 @@ static void check_audio_bandwidth_hdmi( + if (channel_count > 2) { + + /* Based on HDMI spec 1.3 Table 7.5 */ +- if ((crtc_info->requested_pixel_clock <= 27000) && ++ if ((crtc_info->requested_pixel_clock_100Hz <= 270000) && + (crtc_info->v_active <= 576) && + !(crtc_info->interlaced) && + !(crtc_info->pixel_repetition == 2 || + crtc_info->pixel_repetition == 4)) { + limit_freq_to_48_khz = true; + +- } else if ((crtc_info->requested_pixel_clock <= 27000) && ++ } else if ((crtc_info->requested_pixel_clock_100Hz <= 270000) && + (crtc_info->v_active <= 576) && + (crtc_info->interlaced) && + (crtc_info->pixel_repetition == 2)) { + limit_freq_to_88_2_khz = true; + +- } else if ((crtc_info->requested_pixel_clock <= 54000) && ++ } else if ((crtc_info->requested_pixel_clock_100Hz <= 540000) && + (crtc_info->v_active <= 576) && + !(crtc_info->interlaced)) { + limit_freq_to_174_4_khz = true; +@@ -735,8 +735,8 @@ void dce_aud_az_configure( + + /* search pixel clock value for Azalia HDMI Audio */ + static void get_azalia_clock_info_hdmi( +- uint32_t crtc_pixel_clock_in_khz, +- uint32_t actual_pixel_clock_in_khz, ++ uint32_t crtc_pixel_clock_100hz, ++ uint32_t actual_pixel_clock_100Hz, + struct azalia_clock_info *azalia_clock_info) + { + /* audio_dto_phase= 24 * 10,000; +@@ -747,11 +747,11 @@ static void get_azalia_clock_info_hdmi( + /* audio_dto_module = PCLKFrequency * 10,000; + * [khz] -> [100Hz] */ + azalia_clock_info->audio_dto_module = +- actual_pixel_clock_in_khz * 10; ++ actual_pixel_clock_100Hz; + } + + static void get_azalia_clock_info_dp( +- uint32_t requested_pixel_clock_in_khz, ++ uint32_t requested_pixel_clock_100Hz, + const struct audio_pll_info *pll_info, + struct azalia_clock_info *azalia_clock_info) + { +@@ -790,15 +790,15 @@ void dce_aud_wall_dto_setup( + + /* calculate DTO settings */ + get_azalia_clock_info_hdmi( +- crtc_info->requested_pixel_clock, +- crtc_info->calculated_pixel_clock, ++ crtc_info->requested_pixel_clock_100Hz, ++ crtc_info->calculated_pixel_clock_100Hz, + &clock_info); + +- DC_LOG_HW_AUDIO("\n%s:Input::requested_pixel_clock = %d"\ +- "calculated_pixel_clock =%d\n"\ ++ DC_LOG_HW_AUDIO("\n%s:Input::requested_pixel_clock_100Hz = %d"\ ++ "calculated_pixel_clock_100Hz =%d\n"\ + "audio_dto_module = %d audio_dto_phase =%d \n\n", __func__,\ +- crtc_info->requested_pixel_clock,\ +- crtc_info->calculated_pixel_clock,\ ++ crtc_info->requested_pixel_clock_100Hz,\ ++ crtc_info->calculated_pixel_clock_100Hz,\ + clock_info.audio_dto_module,\ + clock_info.audio_dto_phase); + +@@ -831,7 +831,7 @@ void dce_aud_wall_dto_setup( + + calculate DTO settings */ + get_azalia_clock_info_dp( +- crtc_info->requested_pixel_clock, ++ crtc_info->requested_pixel_clock_100Hz, + pll_info, + &clock_info); + +diff --git a/drivers/gpu/drm/amd/display/dc/dce/dce_stream_encoder.c b/drivers/gpu/drm/amd/display/dc/dce/dce_stream_encoder.c +index d13e05a1937d..bd353796b767 100644 +--- a/drivers/gpu/drm/amd/display/dc/dce/dce_stream_encoder.c ++++ b/drivers/gpu/drm/amd/display/dc/dce/dce_stream_encoder.c +@@ -1249,13 +1249,13 @@ static uint32_t calc_max_audio_packets_per_line( + + static void get_audio_clock_info( + enum dc_color_depth color_depth, +- uint32_t crtc_pixel_clock_in_khz, +- uint32_t actual_pixel_clock_in_khz, ++ uint32_t crtc_pixel_clock_100Hz, ++ uint32_t actual_pixel_clock_100Hz, + struct audio_clock_info *audio_clock_info) + { + const struct audio_clock_info *clock_info; + uint32_t index; +- uint32_t crtc_pixel_clock_in_10khz = crtc_pixel_clock_in_khz / 10; ++ uint32_t crtc_pixel_clock_in_10khz = crtc_pixel_clock_100Hz / 100; + uint32_t audio_array_size; + + switch (color_depth) { +@@ -1292,16 +1292,16 @@ static void get_audio_clock_info( + } + + /* not found */ +- if (actual_pixel_clock_in_khz == 0) +- actual_pixel_clock_in_khz = crtc_pixel_clock_in_khz; ++ if (actual_pixel_clock_100Hz == 0) ++ actual_pixel_clock_100Hz = crtc_pixel_clock_100Hz; + + /* See HDMI spec the table entry under + * pixel clock of "Other". */ + audio_clock_info->pixel_clock_in_10khz = +- actual_pixel_clock_in_khz / 10; +- audio_clock_info->cts_32khz = actual_pixel_clock_in_khz; +- audio_clock_info->cts_44khz = actual_pixel_clock_in_khz; +- audio_clock_info->cts_48khz = actual_pixel_clock_in_khz; ++ actual_pixel_clock_100Hz / 100; ++ audio_clock_info->cts_32khz = actual_pixel_clock_100Hz / 10; ++ audio_clock_info->cts_44khz = actual_pixel_clock_100Hz / 10; ++ audio_clock_info->cts_48khz = actual_pixel_clock_100Hz / 10; + + audio_clock_info->n_32khz = 4096; + audio_clock_info->n_44khz = 6272; +@@ -1367,14 +1367,14 @@ static void dce110_se_setup_hdmi_audio( + + /* Program audio clock sample/regeneration parameters */ + get_audio_clock_info(crtc_info->color_depth, +- crtc_info->requested_pixel_clock, +- crtc_info->calculated_pixel_clock, ++ crtc_info->requested_pixel_clock_100Hz, ++ crtc_info->calculated_pixel_clock_100Hz, + &audio_clock_info); + DC_LOG_HW_AUDIO( +- "\n%s:Input::requested_pixel_clock = %d" \ +- "calculated_pixel_clock = %d \n", __func__, \ +- crtc_info->requested_pixel_clock, \ +- crtc_info->calculated_pixel_clock); ++ "\n%s:Input::requested_pixel_clock_100Hz = %d" \ ++ "calculated_pixel_clock_100Hz = %d \n", __func__, \ ++ crtc_info->requested_pixel_clock_100Hz, \ ++ crtc_info->calculated_pixel_clock_100Hz); + + /* HDMI_ACR_32_0__HDMI_ACR_CTS_32_MASK */ + REG_UPDATE(HDMI_ACR_32_0, HDMI_ACR_CTS_32, audio_clock_info.cts_32khz); +diff --git a/drivers/gpu/drm/amd/display/dc/dce110/dce110_hw_sequencer.c b/drivers/gpu/drm/amd/display/dc/dce110/dce110_hw_sequencer.c +index 84d90b475e2a..6fa1f6b5375b 100644 +--- a/drivers/gpu/drm/amd/display/dc/dce110/dce110_hw_sequencer.c ++++ b/drivers/gpu/drm/amd/display/dc/dce110/dce110_hw_sequencer.c +@@ -1159,27 +1159,27 @@ static void build_audio_output( + stream->timing.flags.INTERLACE; + + audio_output->crtc_info.refresh_rate = +- (stream->timing.pix_clk_100hz*10000)/ ++ (stream->timing.pix_clk_100hz*100)/ + (stream->timing.h_total*stream->timing.v_total); + + audio_output->crtc_info.color_depth = + stream->timing.display_color_depth; + +- audio_output->crtc_info.requested_pixel_clock = +- pipe_ctx->stream_res.pix_clk_params.requested_pix_clk_100hz / 10; ++ audio_output->crtc_info.requested_pixel_clock_100Hz = ++ pipe_ctx->stream_res.pix_clk_params.requested_pix_clk_100hz; + +- audio_output->crtc_info.calculated_pixel_clock = +- pipe_ctx->stream_res.pix_clk_params.requested_pix_clk_100hz / 10; ++ audio_output->crtc_info.calculated_pixel_clock_100Hz = ++ pipe_ctx->stream_res.pix_clk_params.requested_pix_clk_100hz; + + /*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->timing.pix_clk_100hz / 10)) { ++ audio_output->crtc_info.requested_pixel_clock_100Hz == ++ (stream->timing.pix_clk_100hz)) { + if (pipe_ctx->stream_res.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->stream_res.pix_clk_params.requested_pix_clk_100hz/20; ++ audio_output->crtc_info.requested_pixel_clock_100Hz = ++ audio_output->crtc_info.requested_pixel_clock_100Hz/2; ++ audio_output->crtc_info.calculated_pixel_clock_100Hz = ++ pipe_ctx->stream_res.pix_clk_params.requested_pix_clk_100hz/2; + + } + } +diff --git a/drivers/gpu/drm/amd/display/dc/dcn10/dcn10_stream_encoder.c b/drivers/gpu/drm/amd/display/dc/dcn10/dcn10_stream_encoder.c +index 2d15ae664226..64adb9fb300c 100644 +--- a/drivers/gpu/drm/amd/display/dc/dcn10/dcn10_stream_encoder.c ++++ b/drivers/gpu/drm/amd/display/dc/dcn10/dcn10_stream_encoder.c +@@ -1195,13 +1195,13 @@ static union audio_cea_channels speakers_to_channels( + + void get_audio_clock_info( + enum dc_color_depth color_depth, +- uint32_t crtc_pixel_clock_in_khz, +- uint32_t actual_pixel_clock_in_khz, ++ uint32_t crtc_pixel_clock_100Hz, ++ uint32_t actual_pixel_clock_100Hz, + struct audio_clock_info *audio_clock_info) + { + const struct audio_clock_info *clock_info; + uint32_t index; +- uint32_t crtc_pixel_clock_in_10khz = crtc_pixel_clock_in_khz / 10; ++ uint32_t crtc_pixel_clock_in_10khz = crtc_pixel_clock_100Hz / 100; + uint32_t audio_array_size; + + switch (color_depth) { +@@ -1238,16 +1238,16 @@ void get_audio_clock_info( + } + + /* not found */ +- if (actual_pixel_clock_in_khz == 0) +- actual_pixel_clock_in_khz = crtc_pixel_clock_in_khz; ++ if (actual_pixel_clock_100Hz == 0) ++ actual_pixel_clock_100Hz = crtc_pixel_clock_100Hz; + + /* See HDMI spec the table entry under + * pixel clock of "Other". */ + audio_clock_info->pixel_clock_in_10khz = +- actual_pixel_clock_in_khz / 10; +- audio_clock_info->cts_32khz = actual_pixel_clock_in_khz; +- audio_clock_info->cts_44khz = actual_pixel_clock_in_khz; +- audio_clock_info->cts_48khz = actual_pixel_clock_in_khz; ++ actual_pixel_clock_100Hz / 100; ++ audio_clock_info->cts_32khz = actual_pixel_clock_100Hz / 10; ++ audio_clock_info->cts_44khz = actual_pixel_clock_100Hz / 10; ++ audio_clock_info->cts_48khz = actual_pixel_clock_100Hz / 10; + + audio_clock_info->n_32khz = 4096; + audio_clock_info->n_44khz = 6272; +@@ -1307,14 +1307,14 @@ static void enc1_se_setup_hdmi_audio( + + /* Program audio clock sample/regeneration parameters */ + get_audio_clock_info(crtc_info->color_depth, +- crtc_info->requested_pixel_clock, +- crtc_info->calculated_pixel_clock, ++ crtc_info->requested_pixel_clock_100Hz, ++ crtc_info->calculated_pixel_clock_100Hz, + &audio_clock_info); + DC_LOG_HW_AUDIO( +- "\n%s:Input::requested_pixel_clock = %d" \ +- "calculated_pixel_clock = %d \n", __func__, \ +- crtc_info->requested_pixel_clock, \ +- crtc_info->calculated_pixel_clock); ++ "\n%s:Input::requested_pixel_clock_100Hz = %d" \ ++ "calculated_pixel_clock_100Hz = %d \n", __func__, \ ++ crtc_info->requested_pixel_clock_100Hz, \ ++ crtc_info->calculated_pixel_clock_100Hz); + + /* HDMI_ACR_32_0__HDMI_ACR_CTS_32_MASK */ + REG_UPDATE(HDMI_ACR_32_0, HDMI_ACR_CTS_32, audio_clock_info.cts_32khz); +diff --git a/drivers/gpu/drm/amd/display/dc/dcn10/dcn10_stream_encoder.h b/drivers/gpu/drm/amd/display/dc/dcn10/dcn10_stream_encoder.h +index bc2b4af9543b..075e49c1283a 100644 +--- a/drivers/gpu/drm/amd/display/dc/dcn10/dcn10_stream_encoder.h ++++ b/drivers/gpu/drm/amd/display/dc/dcn10/dcn10_stream_encoder.h +@@ -605,8 +605,8 @@ void enc1_se_enable_dp_audio( + + void get_audio_clock_info( + enum dc_color_depth color_depth, +- uint32_t crtc_pixel_clock_in_khz, +- uint32_t actual_pixel_clock_in_khz, ++ uint32_t crtc_pixel_clock_100Hz, ++ uint32_t actual_pixel_clock_100Hz, + struct audio_clock_info *audio_clock_info); + + #endif /* __DC_STREAM_ENCODER_DCN10_H__ */ +diff --git a/drivers/gpu/drm/amd/display/include/audio_types.h b/drivers/gpu/drm/amd/display/include/audio_types.h +index 6364fbc24cfe..66a54da0641c 100644 +--- a/drivers/gpu/drm/amd/display/include/audio_types.h ++++ b/drivers/gpu/drm/amd/display/include/audio_types.h +@@ -38,8 +38,8 @@ struct audio_crtc_info { + uint32_t h_active; + uint32_t v_active; + uint32_t pixel_repetition; +- uint32_t requested_pixel_clock; /* in KHz */ +- uint32_t calculated_pixel_clock; /* in KHz */ ++ uint32_t requested_pixel_clock_100Hz; /* in 100Hz */ ++ uint32_t calculated_pixel_clock_100Hz; /* in 100Hz */ + uint32_t refresh_rate; + enum dc_color_depth color_depth; + bool interlaced; +-- +2.17.1 + |