Commit 1c1f6105 authored by Hersen Wu's avatar Hersen Wu Committed by Alex Deucher
Browse files

drm/amd/display: align commit_planes_for_stream to latest dc code 



[Why & How]
Due to historic issues, commit_planes_for_stream() has grown differently
compared to latest dc code. Apply missed changes to make it aligned.

Acked-by: default avatarQingqing Zhuo <qingqing.zhuo@amd.com>
Signed-off-by: default avatarHersen Wu <hersenxs.wu@amd.com>
Tested-by: default avatarDaniel Wheeler <daniel.wheeler@amd.com>
Signed-off-by: default avatarAlex Deucher <alexander.deucher@amd.com>
parent 27dd79c0

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

+3 −23
Original line number Diff line number Diff line
@@ -3493,22 +3493,6 @@ static void commit_planes_for_stream(struct dc *dc, 


	dc_dmub_update_dirty_rect(dc, surface_count, stream, srf_updates, context);



	if (update_type != UPDATE_TYPE_FAST) {

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

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



			if ((new_pipe->stream && new_pipe->stream->mall_stream_config.type == SUBVP_PHANTOM) ||

					subvp_prev_use) {

				// If old context or new context has phantom pipes, apply

				// the phantom timings now. We can't change the phantom

				// pipe configuration safely without driver acquiring

				// the DMCUB lock first.

				dc->hwss.apply_ctx_to_hw(dc, context);

				break;

			}

		}

	}



	// Stream updates

	if (stream_update)

		commit_planes_do_stream_update(dc, stream, stream_update, update_type, context);
@@ -3724,6 +3708,9 @@ static void commit_planes_for_stream(struct dc *dc, 
		}

	}



	if (update_type != UPDATE_TYPE_FAST)

		dc->hwss.post_unlock_program_front_end(dc, context);



	if (subvp_prev_use && !subvp_curr_use) {

		/* If disabling subvp, disable phantom streams after front end

		 * programming has completed (we turn on phantom OTG in order
@@ -3732,16 +3719,9 @@ static void commit_planes_for_stream(struct dc *dc, 
		dc->hwss.apply_ctx_to_hw(dc, context);

	}



	if (update_type != UPDATE_TYPE_FAST)

		dc->hwss.post_unlock_program_front_end(dc, context);

	if (update_type != UPDATE_TYPE_FAST)

		if (dc->hwss.commit_subvp_config)

			dc->hwss.commit_subvp_config(dc, context);



	if (update_type != UPDATE_TYPE_FAST)

		if (dc->hwss.commit_subvp_config)

			dc->hwss.commit_subvp_config(dc, context);



	/* Since phantom pipe programming is moved to post_unlock_program_front_end,

	 * move the SubVP lock to after the phantom pipes have been setup

	 */