Commit e4c1b01b authored by Alvin Lee's avatar Alvin Lee Committed by Alex Deucher
Browse files

drm/amd/display: Use min transition for all SubVP plane add/remove 



[Description]
- Whenever disabling a phantom pipe, we must run through the
  minimal transition sequence
- In the case where SetVisibility = false for the main pipe,
  we also need to run through the min transtion when disabling
  the phantom pipes

Reviewed-by: default avatarJun Lei <Jun.Lei@amd.com>
Acked-by: default avatarTom Chung <chiahsuan.chung@amd.com>
Signed-off-by: default avatarAlvin Lee <Alvin.Lee2@amd.com>
Tested-by: default avatarDaniel Wheeler <daniel.wheeler@amd.com>
Signed-off-by: default avatarAlex Deucher <alexander.deucher@amd.com>
parent 1cb69b43

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

+22 −9
Original line number Diff line number Diff line
@@ -3749,11 +3749,12 @@ static bool could_mpcc_tree_change_for_active_pipes(struct dc *dc, 
		}

	}



	/* For SubVP when adding MPO video we need to add a minimal transition.

	/* For SubVP when adding or removing planes we need to add a minimal transition

	 * (even when disabling all planes). Whenever disabling a phantom pipe, we

	 * must use the minimal transition path to disable the pipe correctly.

	 */

	if (cur_stream_status && stream->mall_stream_config.type == SUBVP_MAIN) {

		/* determine if minimal transition is required due to SubVP*/

		if (surface_count > 0) {

		if (cur_stream_status->plane_count > surface_count) {

			force_minimal_pipe_splitting = true;

		} else if (cur_stream_status->plane_count < surface_count) {
@@ -3761,7 +3762,6 @@ static bool could_mpcc_tree_change_for_active_pipes(struct dc *dc, 
			*is_plane_addition = true;

		}

	}

	}



	return force_minimal_pipe_splitting;

}
@@ -3794,6 +3794,7 @@ static bool commit_minimal_transition_state(struct dc *dc, 
	enum dc_status ret = DC_ERROR_UNEXPECTED;

	unsigned int i, j;

	unsigned int pipe_in_use = 0;

	bool subvp_in_use = false;



	if (!transition_context)

		return false;
@@ -3810,6 +3811,18 @@ static bool commit_minimal_transition_state(struct dc *dc, 
			pipe_in_use++;

	}



	/* If SubVP is enabled and we are adding or removing planes from any main subvp

	 * pipe, we must use the minimal transition.

	 */

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

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



		if (pipe->stream && pipe->stream->mall_stream_config.type == SUBVP_PHANTOM) {

			subvp_in_use = true;

			break;

		}

	}



	/* 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
@@ -3818,7 +3831,7 @@ static bool commit_minimal_transition_state(struct dc *dc, 
	 * 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) {

	if (pipe_in_use != dc->res_pool->pipe_count && !subvp_in_use) {

		dc_release_state(transition_context);

		return true;

	}