Commit 6b8333a5 authored by Wenjing Liu's avatar Wenjing Liu Committed by Alex Deucher
Browse files

drm/amd/display: add new resource interface for acquiring sec opp heads and release pipe 



[why]
We need a new algorithm for acquiring secondary opp heads for ODM combine
in dcn32 and a release pipe interface to properly release pipe resources.

[how]
add two new interfaces in DCN specific resource file.

Reviewed-by: default avatarJun Lei <jun.lei@amd.com>
Acked-by: default avatarHamza Mahfooz <hamza.mahfooz@amd.com>
Signed-off-by: default avatarWenjing Liu <wenjing.liu@amd.com>
Signed-off-by: default avatarAlex Deucher <alexander.deucher@amd.com>
parent 9ba46183

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

+21 −0
Original line number Diff line number Diff line
@@ -1615,6 +1615,27 @@ struct pipe_ctx *resource_find_free_secondary_pipe_legacy( 
	return secondary_pipe;

}



int resource_find_free_pipe_used_as_sec_opp_head_by_cur_otg_master(

		const struct resource_context *cur_res_ctx,

		struct resource_context *new_res_ctx,

		const struct pipe_ctx *cur_otg_master)

{

	const struct pipe_ctx *cur_sec_opp_head = cur_otg_master->next_odm_pipe;

	struct pipe_ctx *new_pipe;

	int free_pipe_idx = FREE_PIPE_INDEX_NOT_FOUND;



	while (cur_sec_opp_head) {

		new_pipe = &new_res_ctx->pipe_ctx[cur_sec_opp_head->pipe_idx];

		if (resource_is_pipe_type(new_pipe, FREE_PIPE)) {

			free_pipe_idx = cur_sec_opp_head->pipe_idx;

			break;

		}

		cur_sec_opp_head = cur_sec_opp_head->next_odm_pipe;

	}



	return free_pipe_idx;

}



int resource_find_free_pipe_used_in_cur_mpc_blending_tree(

		const struct resource_context *cur_res_ctx,

		struct resource_context *new_res_ctx,

drivers/gpu/drm/amd/display/dc/dcn32/dcn32_resource.c

+81 −0
Original line number Diff line number Diff line
@@ -2039,6 +2039,8 @@ static struct resource_funcs dcn32_res_pool_funcs = { 
	.calculate_wm_and_dlg = dcn32_calculate_wm_and_dlg,

	.populate_dml_pipes = dcn32_populate_dml_pipes_from_context,

	.acquire_free_pipe_as_secondary_dpp_pipe = dcn32_acquire_free_pipe_as_secondary_dpp_pipe,

	.acquire_free_pipe_as_secondary_opp_head = dcn32_acquire_free_pipe_as_secondary_opp_head,

	.release_pipe = dcn32_release_pipe,

	.add_stream_to_ctx = dcn30_add_stream_to_ctx,

	.add_dsc_to_stream_resource = dcn20_add_dsc_to_stream_resource,

	.remove_stream_from_ctx = dcn20_remove_stream_from_ctx,
@@ -2669,6 +2671,33 @@ static struct pipe_ctx *dcn32_acquire_idle_pipe_for_head_pipe_in_layer( 
	return idle_pipe;

}



static int find_optimal_free_pipe_as_secondary_opp_head(

		const struct resource_context *cur_res_ctx,

		struct resource_context *new_res_ctx,

		const struct resource_pool *pool,

		const struct pipe_ctx *new_otg_master)

{

	const struct pipe_ctx *cur_otg_master;

	int free_pipe_idx;



	cur_otg_master =  &cur_res_ctx->pipe_ctx[new_otg_master->pipe_idx];

	free_pipe_idx = resource_find_free_pipe_used_as_sec_opp_head_by_cur_otg_master(

			cur_res_ctx, new_res_ctx, cur_otg_master);



	/* Up until here if we have not found a free secondary pipe, we will

	 * need to wait for at least one frame to complete the transition

	 * sequence.

	 */

	if (free_pipe_idx == FREE_PIPE_INDEX_NOT_FOUND)

		free_pipe_idx = recource_find_free_pipe_not_used_in_cur_res_ctx(

				cur_res_ctx, new_res_ctx, pool);



	if (free_pipe_idx == FREE_PIPE_INDEX_NOT_FOUND)

		free_pipe_idx = resource_find_any_free_pipe(new_res_ctx, pool);



	return free_pipe_idx;

}



struct pipe_ctx *dcn32_acquire_free_pipe_as_secondary_dpp_pipe(

		const struct dc_state *cur_ctx,

		struct dc_state *new_ctx,
@@ -2706,6 +2735,58 @@ struct pipe_ctx *dcn32_acquire_free_pipe_as_secondary_dpp_pipe( 
	return free_pipe;

}



struct pipe_ctx *dcn32_acquire_free_pipe_as_secondary_opp_head(

		const struct dc_state *cur_ctx,

		struct dc_state *new_ctx,

		const struct resource_pool *pool,

		const struct pipe_ctx *otg_master)

{

	int free_pipe_idx = find_optimal_free_pipe_as_secondary_opp_head(

			&cur_ctx->res_ctx, &new_ctx->res_ctx,

			pool, otg_master);

	struct pipe_ctx *free_pipe;



	if (free_pipe_idx >= 0) {

		free_pipe = &new_ctx->res_ctx.pipe_ctx[free_pipe_idx];

		free_pipe->pipe_idx = free_pipe_idx;

		free_pipe->stream = otg_master->stream;

		free_pipe->stream_res.tg = otg_master->stream_res.tg;

		free_pipe->stream_res.dsc = NULL;

		free_pipe->stream_res.opp = pool->opps[free_pipe_idx];

		free_pipe->plane_res.mi = pool->mis[free_pipe_idx];

		free_pipe->plane_res.hubp = pool->hubps[free_pipe_idx];

		free_pipe->plane_res.ipp = pool->ipps[free_pipe_idx];

		free_pipe->plane_res.xfm = pool->transforms[free_pipe_idx];

		free_pipe->plane_res.dpp = pool->dpps[free_pipe_idx];

		free_pipe->plane_res.mpcc_inst = pool->dpps[free_pipe_idx]->inst;

		if (free_pipe->stream->timing.flags.DSC == 1) {

			dcn20_acquire_dsc(free_pipe->stream->ctx->dc,

					&new_ctx->res_ctx,

					&free_pipe->stream_res.dsc,

					free_pipe_idx);

			ASSERT(free_pipe->stream_res.dsc);

			if (free_pipe->stream_res.dsc == NULL) {

				memset(free_pipe, 0, sizeof(*free_pipe));

				free_pipe = NULL;

			}

		}

	} else {

		ASSERT(otg_master);

		free_pipe = NULL;

	}



	return free_pipe;

}



void dcn32_release_pipe(struct dc_state *context,

			struct pipe_ctx *pipe,

			const struct resource_pool *pool)

{

	if (resource_is_pipe_type(pipe, OPP_HEAD) && pipe->stream_res.dsc)

		dcn20_release_dsc(&context->res_ctx, pool, &pipe->stream_res.dsc);

	memset(pipe, 0, sizeof(*pipe));

}



unsigned int dcn32_calc_num_avail_chans_for_mall(struct dc *dc, int num_chans)

{

	/*

drivers/gpu/drm/amd/display/dc/dcn32/dcn32_resource.h

+10 −0
Original line number Diff line number Diff line
@@ -142,6 +142,16 @@ struct pipe_ctx *dcn32_acquire_free_pipe_as_secondary_dpp_pipe( 
		const struct resource_pool *pool,

		const struct pipe_ctx *opp_head_pipe);



struct pipe_ctx *dcn32_acquire_free_pipe_as_secondary_opp_head(

		const struct dc_state *cur_ctx,

		struct dc_state *new_ctx,

		const struct resource_pool *pool,

		const struct pipe_ctx *otg_master);



void dcn32_release_pipe(struct dc_state *context,

			struct pipe_ctx *pipe,

			const struct resource_pool *pool);



void dcn32_determine_det_override(struct dc *dc,

		struct dc_state *context,

		display_e2e_pipe_params_st *pipes);

drivers/gpu/drm/amd/display/dc/inc/core_types.h

+10 −0
Original line number Diff line number Diff line
@@ -132,6 +132,16 @@ struct resource_funcs { 
			const struct resource_pool *pool,

			const struct pipe_ctx *opp_head_pipe);



	struct pipe_ctx *(*acquire_free_pipe_as_secondary_opp_head)(

			const struct dc_state *cur_ctx,

			struct dc_state *new_ctx,

			const struct resource_pool *pool,

			const struct pipe_ctx *otg_master);



	void (*release_pipe)(struct dc_state *context,

			struct pipe_ctx *pipe,

			const struct resource_pool *pool);



	enum dc_status (*validate_plane)(

			const struct dc_plane_state *plane_state,

			struct dc_caps *caps);

drivers/gpu/drm/amd/display/dc/inc/resource.h

+12 −0
Original line number Diff line number Diff line
@@ -280,6 +280,18 @@ bool resource_is_pipe_type(const struct pipe_ctx *pipe_ctx, enum pipe_type type) 
 */

bool resource_is_for_mpcc_combine(const struct pipe_ctx *pipe_ctx);



/*

 * Look for a free pipe in new resource context that is used as a secondary OPP

 * head by cur_otg_master.

 *

 * return - FREE_PIPE_INDEX_NOT_FOUND if free pipe is not found, otherwise

 * pipe idx of the free pipe

 */

int resource_find_free_pipe_used_as_sec_opp_head_by_cur_otg_master(

		const struct resource_context *cur_res_ctx,

		struct resource_context *new_res_ctx,

		const struct pipe_ctx *cur_otg_master);



/*

 * Look for a free pipe in new resource context that is used as a secondary DPP

 * pipe in MPC blending tree associated with input OPP head pipe.