[PATCH 4/7] drm/amd/display: Fill display clock and vblank time in dce110_fill_display_configs

[Alex Deucher]

On Thu, Jul 31, 2025 at 5:53 AM Timur Kristóf <timur.kristof at gmail.com> wrote:
>
> Also needed by DCE 6.
> This way the code that gathers this info can be shared between
> different DCE versions and doesn't have to be repeated.
>
> Signed-off-by: Timur Kristóf <timur.kristof at gmail.com>

Acked-by: Alex Deucher <alexander.deucher at amd.com>

> ---
>  .../drm/amd/display/dc/clk_mgr/dce100/dce_clk_mgr.c    |  2 --
>  .../drm/amd/display/dc/clk_mgr/dce110/dce110_clk_mgr.c | 10 +++-------
>  .../drm/amd/display/dc/clk_mgr/dce60/dce60_clk_mgr.c   |  2 --
>  3 files changed, 3 insertions(+), 11 deletions(-)
>
> diff --git a/drivers/gpu/drm/amd/display/dc/clk_mgr/dce100/dce_clk_mgr.c b/drivers/gpu/drm/amd/display/dc/clk_mgr/dce100/dce_clk_mgr.c
> index 69e9540f553b..17a8b46b0818 100644
> --- a/drivers/gpu/drm/amd/display/dc/clk_mgr/dce100/dce_clk_mgr.c
> +++ b/drivers/gpu/drm/amd/display/dc/clk_mgr/dce100/dce_clk_mgr.c
> @@ -386,8 +386,6 @@ static void dce_pplib_apply_display_requirements(
>  {
>         struct dm_pp_display_configuration *pp_display_cfg = &context->pp_display_cfg;
>
> -       pp_display_cfg->avail_mclk_switch_time_us = dce110_get_min_vblank_time_us(context);
> -
>         dce110_fill_display_configs(context, pp_display_cfg);
>
>         if (memcmp(&dc->current_state->pp_display_cfg, pp_display_cfg, sizeof(*pp_display_cfg)) !=  0)
> diff --git a/drivers/gpu/drm/amd/display/dc/clk_mgr/dce110/dce110_clk_mgr.c b/drivers/gpu/drm/amd/display/dc/clk_mgr/dce110/dce110_clk_mgr.c
> index baeac8f1c04f..13cf415e38e5 100644
> --- a/drivers/gpu/drm/amd/display/dc/clk_mgr/dce110/dce110_clk_mgr.c
> +++ b/drivers/gpu/drm/amd/display/dc/clk_mgr/dce110/dce110_clk_mgr.c
> @@ -124,6 +124,9 @@ void dce110_fill_display_configs(
>         int j;
>         int num_cfgs = 0;
>
> +       pp_display_cfg->avail_mclk_switch_time_us = dce110_get_min_vblank_time_us(context);
> +       pp_display_cfg->disp_clk_khz = dc->clk_mgr->clks.dispclk_khz;
> +       pp_display_cfg->avail_mclk_switch_time_in_disp_active_us = 0;
>         pp_display_cfg->crtc_index = dc->res_pool->res_cap->num_timing_generator;
>
>         for (j = 0; j < context->stream_count; j++) {
> @@ -243,13 +246,6 @@ void dce11_pplib_apply_display_requirements(
>         pp_display_cfg->min_engine_clock_deep_sleep_khz
>                         = context->bw_ctx.bw.dce.sclk_deep_sleep_khz;
>
> -       pp_display_cfg->avail_mclk_switch_time_us =
> -                                               dce110_get_min_vblank_time_us(context);
> -       /* TODO: dce11.2*/
> -       pp_display_cfg->avail_mclk_switch_time_in_disp_active_us = 0;
> -
> -       pp_display_cfg->disp_clk_khz = dc->clk_mgr->clks.dispclk_khz;
> -
>         dce110_fill_display_configs(context, pp_display_cfg);
>
>         if (memcmp(&dc->current_state->pp_display_cfg, pp_display_cfg, sizeof(*pp_display_cfg)) !=  0)
> diff --git a/drivers/gpu/drm/amd/display/dc/clk_mgr/dce60/dce60_clk_mgr.c b/drivers/gpu/drm/amd/display/dc/clk_mgr/dce60/dce60_clk_mgr.c
> index cfd7309f2c6a..7044b437fe9d 100644
> --- a/drivers/gpu/drm/amd/display/dc/clk_mgr/dce60/dce60_clk_mgr.c
> +++ b/drivers/gpu/drm/amd/display/dc/clk_mgr/dce60/dce60_clk_mgr.c
> @@ -109,8 +109,6 @@ static void dce60_pplib_apply_display_requirements(
>  {
>         struct dm_pp_display_configuration *pp_display_cfg = &context->pp_display_cfg;
>
> -       pp_display_cfg->avail_mclk_switch_time_us = dce110_get_min_vblank_time_us(context);
> -
>         dce110_fill_display_configs(context, pp_display_cfg);
>
>         if (memcmp(&dc->current_state->pp_display_cfg, pp_display_cfg, sizeof(*pp_display_cfg)) !=  0)
> --
> 2.50.1
>