Commit 99243fd1 authored by Dillon Varone's avatar Dillon Varone Committed by Alex Deucher
Browse files

Revert "drm/amd/display: skip commit minimal transition state" 



This reverts commit e4e481e4.

[Why & How]
The reverted commit creates memory leak and causes issue
upon driver install.

Tested-by: default avatarDaniel Wheeler <daniel.wheeler@amd.com>
Reviewed-by: default avatarMartin Leung <Martin.Leung@amd.com>
Acked-by: default avatarQingqing Zhuo <qingqing.zhuo@amd.com>
Signed-off-by: default avatarDillon Varone <Dillon.Varone@amd.com>
Signed-off-by: default avatarAlex Deucher <alexander.deucher@amd.com>
parent 4f5bdde3

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

+0 −20
Original line number Diff line number Diff line
@@ -3650,30 +3650,10 @@ static bool commit_minimal_transition_state(struct dc *dc, 
	bool temp_subvp_policy;

	enum dc_status ret = DC_ERROR_UNEXPECTED;

	unsigned int i, j;

	unsigned int pipe_in_use = 0;



	if (!transition_context)

		return false;



	/* check current pipes in use*/

	for (i = 0; i < dc->res_pool->pipe_count; i++) {

		struct pipe_ctx *pipe = &transition_base_context->res_ctx.pipe_ctx[i];



		if (pipe->plane_state)

			pipe_in_use++;

	}



	/* When the OS add a new surface if we have been used all of pipes with odm combine

	 * and mpc split feature, it need use commit_minimal_transition_state to transition safely.

	 * After OS exit MPO, it will back to use odm and mpc split with all of pipes, we need

	 * call it again. Otherwise return true to skip.

	 *

	 * Reduce the scenarios to use dc_commit_state_no_check in the stage of flip. Especially

	 * enter/exit MPO when DCN still have enough resources.

	 */

	if (pipe_in_use != dc->res_pool->pipe_count)

		return true;



	if (!dc->config.is_vmin_only_asic) {

		tmp_mpc_policy = dc->debug.pipe_split_policy;

		dc->debug.pipe_split_policy = MPC_SPLIT_AVOID;