Commit 896dace8 authored by Joseph Gravenor's avatar Joseph Gravenor Committed by Alex Deucher
Browse files

drm/amd/display: turn off the mst hub before we do detection 



[why]
not turning off the mst hub before detection on reboot
causes us to not be able to light up displays with mst hook

[how]
on hw init, see if any displays are lit up. if so, turn them off

Signed-off-by: default avatarJoseph Gravenor <joseph.gravenor@amd.com>
Reviewed-by: default avatarEric Yang <eric.yang2@amd.com>
Acked-by: default avatarBhawanpreet Lakha <Bhawanpreet.Lakha@amd.com>
Signed-off-by: default avatarAlex Deucher <alexander.deucher@amd.com>
parent 15add0c2

drivers/gpu/drm/amd/display/dc/dcn10/dcn10_hw_sequencer.c

+20 −2
Original line number Original line Diff line number Diff line
@@ -48,8 +48,8 @@ 
#include "dc_link_dp.h"

#include "dc_link_dp.h"

#include "dccg.h"

#include "dccg.h"

#include "clk_mgr.h"

#include "clk_mgr.h"



#include "link_hwss.h"



#include "dpcd_defs.h"

#include "dsc.h"

#include "dsc.h"





#define DC_LOGGER_INIT(logger)

#define DC_LOGGER_INIT(logger)
@@ -1322,6 +1322,24 @@ void dcn10_init_hw(struct dc *dc) 
		if (hws->funcs.dsc_pg_control != NULL)

		if (hws->funcs.dsc_pg_control != NULL)

			hws->funcs.dsc_pg_control(hws, res_pool->dscs[i]->inst, false);

			hws->funcs.dsc_pg_control(hws, res_pool->dscs[i]->inst, false);





	/* we want to turn off all dp displays before doing detection */

	if (dc->config.power_down_display_on_boot) {

		uint8_t dpcd_power_state = '\0';

		enum dc_status status = DC_ERROR_UNEXPECTED;



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

			if (dc->links[i]->connector_signal != SIGNAL_TYPE_DISPLAY_PORT) {

				continue;

			}

			/* if any of the displays are lit up turn them off */

			status = core_link_read_dpcd(dc->links[i], DP_SET_POWER,

						     &dpcd_power_state, sizeof(dpcd_power_state));

			if (status == DC_OK && dpcd_power_state == DP_POWER_STATE_D0) {

				dp_receiver_power_ctrl(dc->links[i], false);

			}

		}

	}



	/* If taking control over from VBIOS, we may want to optimize our first

	/* If taking control over from VBIOS, we may want to optimize our first

	 * mode set, so we need to skip powering down pipes until we know which

	 * mode set, so we need to skip powering down pipes until we know which

	 * pipes we want to use.

	 * pipes we want to use.

CRA Git | Maintained and supported by SUSTech CRA and CCSE