Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 949785b5 authored by Tony Cheng's avatar Tony Cheng Committed by Alex Deucher
Browse files

drm/amd/display: fix plane update prior to stream enablement 



plane update prior to stream enablement is there to recombine pipe
in case we need free pipe for new display.  need to pass in new state
or we will just re-applyingwhat we already have

Signed-off-by: default avatarTony Cheng <tony.cheng@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 19ec320e

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

+4 −2
Original line number Diff line number Diff line
@@ -887,12 +887,14 @@ static enum dc_status dc_commit_state_no_check(struct dc *dc, struct dc_state *c 
	if (!dcb->funcs->is_accelerated_mode(dcb))

		dc->hwss.enable_accelerated_mode(dc);



	/* Combine planes if required, in case of pipe split disable */

	/* re-program planes for existing stream, in case we need to

	 * free up plane resource for later use

	 */

	for (i = 0; i < dc->current_state->stream_count; i++) {

		dc->hwss.apply_ctx_for_surface(

			dc, dc->current_state->streams[i],

			dc->current_state->stream_status[i].plane_count,

			dc->current_state);

			context); /* use new pipe config in new context */

	}



	/* Program hardware */