Commit 984abb53 authored by Chiawen Huang's avatar Chiawen Huang Committed by Alex Deucher
Browse files

drm/amd/display: remove duplicated edp relink to fastboot 



[Why&How]
enable_accelerated_mode function is fully to check
whether fastboot support or not.
It is no longer to disable_vbios_mode_if_required.

Reviewed-by: default avatarAnthony Koo <anthony.koo@amd.com>
Acked-by: default avatarAurabindo Pillai <aurabindo.pillai@amd.com>
Signed-off-by: default avatarChiawen Huang <chiawen.huang@amd.com>
Tested-by: default avatarDaniel Wheeler <daniel.wheeler@amd.com>
Signed-off-by: default avatarAlex Deucher <alexander.deucher@amd.com>
parent b3551d0b

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

+0 −59
Original line number Diff line number Diff line
@@ -1212,64 +1212,6 @@ static void disable_dangling_plane(struct dc *dc, struct dc_state *context) 
	dc_release_state(current_ctx);

}



static void disable_vbios_mode_if_required(

		struct dc *dc,

		struct dc_state *context)

{

	unsigned int i, j;



	/* check if timing_changed, disable stream*/

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

		struct dc_stream_state *stream = NULL;

		struct dc_link *link = NULL;

		struct pipe_ctx *pipe = NULL;



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

		stream = pipe->stream;

		if (stream == NULL)

			continue;



		// only looking for first odm pipe

		if (pipe->prev_odm_pipe)

			continue;



		if (stream->link->local_sink &&

			stream->link->local_sink->sink_signal == SIGNAL_TYPE_EDP) {

			link = stream->link;

		}



		if (link != NULL && link->link_enc->funcs->is_dig_enabled(link->link_enc)) {

			unsigned int enc_inst, tg_inst = 0;

			unsigned int pix_clk_100hz;



			enc_inst = link->link_enc->funcs->get_dig_frontend(link->link_enc);

			if (enc_inst != ENGINE_ID_UNKNOWN) {

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

					if (dc->res_pool->stream_enc[j]->id == enc_inst) {

						tg_inst = dc->res_pool->stream_enc[j]->funcs->dig_source_otg(

							dc->res_pool->stream_enc[j]);

						break;

					}

				}



				dc->res_pool->dp_clock_source->funcs->get_pixel_clk_frequency_100hz(

					dc->res_pool->dp_clock_source,

					tg_inst, &pix_clk_100hz);



				if (link->link_status.link_active) {

					uint32_t requested_pix_clk_100hz =

						pipe->stream_res.pix_clk_params.requested_pix_clk_100hz;



					if (pix_clk_100hz != requested_pix_clk_100hz) {

						dc->link_srv->set_dpms_off(pipe);

						pipe->stream->dpms_off = false;

					}

				}

			}

		}

	}

}



static void wait_for_no_pipes_pending(struct dc *dc, struct dc_state *context)

{

	int i;
@@ -1839,7 +1781,6 @@ static enum dc_status dc_commit_state_no_check(struct dc *dc, struct dc_state *c 
		dc_streams[i] =  context->streams[i];



	if (!dcb->funcs->is_accelerated_mode(dcb)) {

		disable_vbios_mode_if_required(dc, context);

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

	}