Commit 5d6d185f authored by Dmytro Laktyushkin's avatar Dmytro Laktyushkin Committed by Alex Deucher
Browse files

drm/amd/display: restyle display clock calls part 2 



Signed-off-by: default avatarDmytro Laktyushkin <Dmytro.Laktyushkin@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 1a687574

drivers/gpu/drm/amd/display/dc/core/dc_link.c

+6 −5
Original line number Diff line number Diff line
@@ -1223,12 +1223,13 @@ static enum dc_status enable_link_dp(struct pipe_ctx *pipe_ctx) 
	if (link_settings.link_rate == max_link_rate) {

		cur_min_clock_state = CLOCKS_STATE_INVALID;



		if (dal_display_clock_get_min_clocks_state(

				pipe_ctx->dis_clk, &cur_min_clock_state)) {

		if (pipe_ctx->dis_clk->funcs->get_min_clocks_state) {

			cur_min_clock_state =

				pipe_ctx->dis_clk->funcs->get_min_clocks_state(

							pipe_ctx->dis_clk);

			if (cur_min_clock_state < CLOCKS_STATE_NOMINAL)

				dal_display_clock_set_min_clocks_state(

						pipe_ctx->dis_clk,

						CLOCKS_STATE_NOMINAL);

				pipe_ctx->dis_clk->funcs->set_min_clocks_state(

					pipe_ctx->dis_clk, CLOCKS_STATE_NOMINAL);

		} else {

		}

	}

drivers/gpu/drm/amd/display/dc/dce100/dce100_resource.c

+3 −1
Original line number Diff line number Diff line
@@ -717,7 +717,9 @@ static void destruct(struct dce110_resource_pool *pool) 
	}



	if (pool->base.display_clock != NULL)

		dal_display_clock_destroy(&pool->base.display_clock);

		pool->base.display_clock->funcs->destroy(

				&pool->base.display_clock);

		pool->base.display_clock = NULL;



	if (pool->base.irqs != NULL)

		dal_irq_service_destroy(&pool->base.irqs);

drivers/gpu/drm/amd/display/dc/dce110/dce110_hw_sequencer.c

+8 −5
Original line number Diff line number Diff line
@@ -1099,9 +1099,11 @@ static void apply_min_clocks( 


	if (!pre_mode_set) {

		/* set clock_state without verification */

		if (dal_display_clock_set_min_clocks_state(

				pipe_ctx->dis_clk, *clocks_state))

		if (pipe_ctx->dis_clk->funcs->set_min_clocks_state) {

			pipe_ctx->dis_clk->funcs->set_min_clocks_state(

						pipe_ctx->dis_clk, *clocks_state);

			return;

		}



		/* TODOFPGA */

	}
@@ -1114,9 +1116,10 @@ static void apply_min_clocks( 
	req_clocks.pixel_clk_khz = get_max_pixel_clock_for_all_paths(

			dc, context, true);



	if (dal_display_clock_get_required_clocks_state(

				pipe_ctx->dis_clk, &req_clocks, clocks_state)) {

		dal_display_clock_set_min_clocks_state(

	if (pipe_ctx->dis_clk->funcs->get_required_clocks_state) {

		*clocks_state = pipe_ctx->dis_clk->funcs->get_required_clocks_state(

				pipe_ctx->dis_clk, &req_clocks);

		pipe_ctx->dis_clk->funcs->set_min_clocks_state(

			pipe_ctx->dis_clk, *clocks_state);

	} else {

	}

drivers/gpu/drm/amd/display/dc/dce110/dce110_resource.c

+3 −1
Original line number Diff line number Diff line
@@ -700,7 +700,9 @@ static void destruct(struct dce110_resource_pool *pool) 
	}



	if (pool->base.display_clock != NULL) {

		dal_display_clock_destroy(&pool->base.display_clock);

		pool->base.display_clock->funcs->destroy(

				&pool->base.display_clock);

		pool->base.display_clock = NULL;

	}



	if (pool->base.irqs != NULL) {

drivers/gpu/drm/amd/display/dc/dce112/dce112_resource.c

+3 −1
Original line number Diff line number Diff line
@@ -734,7 +734,9 @@ static void destruct(struct dce110_resource_pool *pool) 
	}



	if (pool->base.display_clock != NULL) {

		dal_display_clock_destroy(&pool->base.display_clock);

		pool->base.display_clock->funcs->destroy(

				&pool->base.display_clock);

		pool->base.display_clock = NULL;

	}



	if (pool->base.irqs != NULL) {