Commit 05133ac8 authored by SivapiriyanKumarasamy's avatar SivapiriyanKumarasamy Committed by Alex Deucher
Browse files

drm/amd/display: Synchronize update plane addr for freesync 



Lock top_pipe when doing update plane addr for split pipe freesync case

Signed-off-by: default avatarSivapiriyanKumarasamy <sivapiriyan.kumarasamy@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 9182b4cb

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

+31 −16
Original line number Diff line number Diff line
@@ -1278,6 +1278,7 @@ static void commit_planes_for_stream(struct dc *dc, 
		struct dc_state *context)

{

	int i, j;

	struct pipe_ctx *top_pipe_to_program = NULL;



	if (update_type == UPDATE_TYPE_FULL) {

		dc->hwss.set_bandwidth(dc, context, false);
@@ -1297,13 +1298,17 @@ static void commit_planes_for_stream(struct dc *dc, 
	for (j = 0; j < dc->res_pool->pipe_count; j++) {

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



		if (update_type == UPDATE_TYPE_FAST || !pipe_ctx->plane_state)

			continue;



		if (!pipe_ctx->top_pipe &&

			pipe_ctx->stream &&

			pipe_ctx->stream == stream) {

			struct dc_stream_status *stream_status =

			struct dc_stream_status *stream_status = NULL;



			top_pipe_to_program = pipe_ctx;



			if (update_type == UPDATE_TYPE_FAST || !pipe_ctx->plane_state)

				continue;



			stream_status =

					stream_get_status(context, pipe_ctx->stream);



			dc->hwss.apply_ctx_for_surface(
@@ -1314,6 +1319,13 @@ static void commit_planes_for_stream(struct dc *dc, 
	if (update_type == UPDATE_TYPE_FULL)

		context_timing_trace(dc, &context->res_ctx);



	/* Lock the top pipe while updating plane addrs, since freesync requires

	 *  plane addr update event triggers to be synchronized.

	 *  top_pipe_to_program is expected to never be NULL

	 */

	if (update_type == UPDATE_TYPE_FAST) {

		dc->hwss.pipe_control_lock(dc, top_pipe_to_program, true);



		/* Perform requested Updates */

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

			struct dc_plane_state *plane_state = srf_updates[i].surface;
@@ -1327,11 +1339,14 @@ static void commit_planes_for_stream(struct dc *dc, 
				if (pipe_ctx->plane_state != plane_state)

					continue;



			if (update_type == UPDATE_TYPE_FAST && srf_updates[i].flip_addr)

				if (srf_updates[i].flip_addr)

					dc->hwss.update_plane_addr(dc, pipe_ctx);

			}

		}



		dc->hwss.pipe_control_lock(dc, top_pipe_to_program, false);

	}



	if (stream && stream_update && update_type > UPDATE_TYPE_FAST)

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

			struct pipe_ctx *pipe_ctx =

CRA Git | Maintained and supported by SUSTech CRA and CCSE