Commit f5b9c1ff authored by Ethan Wellenreiter's avatar Ethan Wellenreiter Committed by Alex Deucher
Browse files

drm/amd/display: Re-initialize viewport after pipe merge 



[Why]
Pipes get merged in preparation for SubVP but if they don't get used, and
are in ODM or some other multi pipe config, it would calculate the
voltage level with a viewport of just one pipe from when they were split
resulting in too low of a voltage level.

[How]
Made it so that the viewport and other timing settings get rebuilt and re-
initialized after the pipe merge, before calculating the voltage level so it
would calculate it correctly.

Reviewed-by: default avatarAlvin Lee <Alvin.Lee2@amd.com>
Reviewed-by: default avatarJun Lei <Jun.Lei@amd.com>
Acked-by: default avatarBrian Chang <Brian.Chang@amd.com>
Signed-off-by: default avatarEthan Wellenreiter <Ethan.Wellenreiter@amd.com>
Tested-by: default avatarDaniel Wheeler <daniel.wheeler@amd.com>
Signed-off-by: default avatarAlex Deucher <alexander.deucher@amd.com>
parent 6ffc967c

drivers/gpu/drm/amd/display/dc/dml/dcn32/dcn32_fpu.c

+9 −0
Original line number Diff line number Diff line
@@ -1014,6 +1014,15 @@ static void dcn32_full_validate_bw_helper(struct dc *dc, 
	    dc->debug.force_subvp_mclk_switch)) {



		dcn32_merge_pipes_for_subvp(dc, context);

		// to re-initialize viewport after the pipe merge

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

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



			if (!pipe_ctx->plane_state || !pipe_ctx->stream)

				continue;



			resource_build_scaling_params(pipe_ctx);

		}



		while (!found_supported_config && dcn32_enough_pipes_for_subvp(dc, context) &&

			dcn32_assign_subvp_pipe(dc, context, &dc_pipe_idx)) {