Commit e9917ef8 authored by Aric Cyr's avatar Aric Cyr Committed by Alex Deucher
Browse files

drm/amd/display: Only wait for flip pending on immediate flips 



[Why]
We want to make sure all immediate flips are completed before locking
the pipes, but not pipes that are not flip immediate as they will be
locked by the OTG

[How]
Skip non flip immediate pipes when checking for flip pending.

Signed-off-by: default avatarAric Cyr <aric.cyr@amd.com>
Acked-by: default avatarBindu Ramamurthy <bindu.r@amd.com>
Signed-off-by: default avatarAlex Deucher <alexander.deucher@amd.com>
parent 06d55ffa

drivers/gpu/drm/amd/display/dc/dcn20/dcn20_hwseq.c

+15 −14
Original line number Diff line number Diff line
@@ -1174,18 +1174,19 @@ void dcn20_pipe_control_lock( 
		const int TIMEOUT_FOR_FLIP_PENDING = 100000;

		int i;



		temp_pipe = pipe;

		while (temp_pipe) {

			if (temp_pipe->plane_state && temp_pipe->plane_state->flip_immediate) {

				for (i = 0; i < TIMEOUT_FOR_FLIP_PENDING; ++i) {

			if (!pipe->plane_res.hubp->funcs->hubp_is_flip_pending(pipe->plane_res.hubp))

					if (!temp_pipe->plane_res.hubp->funcs->hubp_is_flip_pending(temp_pipe->plane_res.hubp))

						break;

					udelay(1);

				}



		if (pipe->bottom_pipe != NULL) {

			for (i = 0; i < TIMEOUT_FOR_FLIP_PENDING; ++i) {

				if (!pipe->bottom_pipe->plane_res.hubp->funcs->hubp_is_flip_pending(pipe->bottom_pipe->plane_res.hubp))

					break;

				udelay(1);

				/* no reason it should take this long for immediate flips */

				ASSERT(i != TIMEOUT_FOR_FLIP_PENDING);

			}

			temp_pipe = temp_pipe->bottom_pipe;

		}

	}