Commit 4a86858d authored by Lai, Derek's avatar Lai, Derek Committed by Alex Deucher
Browse files

drm/amd/display: Removed power down on boot from DCN31 



[Why]
Error message on Linux when booting.

[How]
Removed power down on boot from DCN31 HW init
to match DCN10 HW init.

Reviewed-by: default avatarAnthony Koo <Anthony.Koo@amd.com>
Acked-by: default avatarAgustin Gutierrez Sanchez <agustin.gutierrez@amd.com>
Signed-off-by: default avatarDerek Lai <derek.lai@amd.com>
Tested-by: default avatarDaniel Wheeler <daniel.wheeler@amd.com>
Signed-off-by: default avatarAlex Deucher <alexander.deucher@amd.com>
parent 94e587b8

drivers/gpu/drm/amd/display/dc/dcn31/dcn31_hwseq.c

+0 −43
Original line number Diff line number Diff line
@@ -73,7 +73,6 @@ void dcn31_init_hw(struct dc *dc) 
	struct resource_pool *res_pool = dc->res_pool;

	uint32_t backlight = MAX_BACKLIGHT_LEVEL;

	int i;

	int edp_num;



	if (dc->clk_mgr && dc->clk_mgr->funcs->init_clocks)

		dc->clk_mgr->funcs->init_clocks(dc->clk_mgr);
@@ -209,48 +208,6 @@ void dcn31_init_hw(struct dc *dc) 
					!dc->res_pool->hubbub->ctx->dc->debug.disable_stutter);

	}



	/* In headless boot cases, DIG may be turned

	 * on which causes HW/SW discrepancies.

	 * To avoid this, power down hardware on boot

	 * if DIG is turned on and seamless boot not enabled

	 */

	if (dc->config.power_down_display_on_boot) {

		struct dc_link *edp_links[MAX_NUM_EDP];

		struct dc_link *edp_link;

		bool power_down = false;



		get_edp_links(dc, edp_links, &edp_num);

		if (edp_num) {

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

				edp_link = edp_links[i];

				if (edp_link->link_enc->funcs->is_dig_enabled &&

						edp_link->link_enc->funcs->is_dig_enabled(edp_link->link_enc) &&

						dc->hwss.edp_backlight_control &&

						dc->hwss.power_down &&

						dc->hwss.edp_power_control) {

					dc->hwss.edp_backlight_control(edp_link, false);

					dc->hwss.power_down(dc);

					dc->hwss.edp_power_control(edp_link, false);

					power_down = true;

				}

			}

		}

		if (!power_down) {

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

				struct dc_link *link = dc->links[i];



				if (link->ep_type == DISPLAY_ENDPOINT_PHY &&

						link->link_enc->funcs->is_dig_enabled &&

						link->link_enc->funcs->is_dig_enabled(link->link_enc) &&

						dc->hwss.power_down) {

					dc->hwss.power_down(dc);

					break;

				}



			}

		}

	}



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

		struct audio *audio = res_pool->audios[i];