Commit 8107432d authored by Timur Kristóf's avatar Timur Kristóf Committed by Alex Deucher
Browse files

drm/amd/display: Fill display clock and vblank time in dce110_fill_display_configs 



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: default avatarTimur Kristóf <timur.kristof@gmail.com>
Acked-by: default avatarAlex Deucher <alexander.deucher@amd.com>
Reviewed-by: default avatarRodrigo Siqueira <siqueira@igalia.com>
Reviewed-by: default avatarAlex Hung <alex.hung@amd.com>
Signed-off-by: default avatarAlex Deucher <alexander.deucher@amd.com>
parent 4ab09785

drivers/gpu/drm/amd/display/dc/clk_mgr/dce100/dce_clk_mgr.c

+0 −2
Original line number Diff line number Diff line
@@ -391,8 +391,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)

drivers/gpu/drm/amd/display/dc/clk_mgr/dce110/dce110_clk_mgr.c

+3 −7
Original line number Diff line number Diff line
@@ -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)

drivers/gpu/drm/amd/display/dc/clk_mgr/dce60/dce60_clk_mgr.c

+0 −2
Original line number Diff line number Diff line
@@ -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)