Commit 3550d622 authored by Leo (Hanghong) Ma's avatar Leo (Hanghong) Ma Committed by Alex Deucher
Browse files

drm/amd/display: Add DPCD writes at key points 



This reverts commit "Revert "Add DPCD writes at key points" ".
The following patch will fix the system hang issue.

v2: squash in indentation warning fix

Signed-off-by: default avatarLeo (Hanghong) Ma <hanghong.ma@amd.com>
Acked-by: default avatarMikita Lipski <mikita.lipski@amd.com>
Reviewed-by: default avatarAric Cyr <aric.cyr@amd.com>
Tested-by: default avatarDaniel Wheeler <daniel.wheeler@amd.com>
Signed-off-by: default avatarAlex Deucher <alexander.deucher@amd.com>
parent b25715a0

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

+7 −0
Original line number Diff line number Diff line
@@ -3572,6 +3572,7 @@ void core_link_enable_stream( 
{

	struct dc *dc = pipe_ctx->stream->ctx->dc;

	struct dc_stream_state *stream = pipe_ctx->stream;

	struct dc_link *link = stream->sink->link;

	enum dc_status status;

#if defined(CONFIG_DRM_AMD_DC_DCN)

	enum otg_out_mux_dest otg_out_dest = OUT_MUX_DIO;
@@ -3624,6 +3625,9 @@ void core_link_enable_stream( 
			stream->link->dpcd_caps.dprx_feature.bits.SST_SPLIT_SDP_CAP);

#endif



	if (dc_is_dp_signal(pipe_ctx->stream->signal))

		dp_source_sequence_trace(link, DPCD_SOURCE_SEQ_AFTER_DP_STREAM_ATTR);



	if (dc_is_hdmi_tmds_signal(pipe_ctx->stream->signal))

		pipe_ctx->stream_res.stream_enc->funcs->hdmi_set_stream_attribute(

			pipe_ctx->stream_res.stream_enc,
@@ -3659,6 +3663,9 @@ void core_link_enable_stream( 
		resource_build_info_frame(pipe_ctx);

		dc->hwss.update_info_frame(pipe_ctx);



		if (dc_is_dp_signal(pipe_ctx->stream->signal))

			dp_source_sequence_trace(link, DPCD_SOURCE_SEQ_AFTER_UPDATE_INFO_FRAME);



		/* Do not touch link on seamless boot optimization. */

		if (pipe_ctx->stream->apply_seamless_boot_optimization) {

			pipe_ctx->stream->dpms_off = false;

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

+4 −4
Original line number Diff line number Diff line
@@ -2370,11 +2370,11 @@ bool perform_link_training_with_retries( 
	/* We need to do this before the link training to ensure the idle pattern in SST

	 * mode will be sent right after the link training

	 */

#if defined(CONFIG_DRM_AMD_DC_DCN)

	if (dp_get_link_encoding_format(&current_setting) == DP_8b_10b_ENCODING)

#endif

	if (dp_get_link_encoding_format(&current_setting) == DP_8b_10b_ENCODING) {

		link_enc->funcs->connect_dig_be_to_fe(link_enc,

							pipe_ctx->stream_res.stream_enc->id, true);

		dp_source_sequence_trace(link, DPCD_SOURCE_SEQ_AFTER_CONNECT_DIG_FE_BE);

	}



	for (j = 0; j < attempts; ++j) {
@@ -5267,7 +5267,7 @@ bool dc_link_dp_set_test_pattern( 
			 * MuteAudioEndpoint(pPathMode->pDisplayPath, true);

			 */

			/* Blank stream */

			pipes->stream_res.stream_enc->funcs->dp_blank(pipe_ctx->stream_res.stream_enc);

			pipes->stream_res.stream_enc->funcs->dp_blank(link, pipe_ctx->stream_res.stream_enc);

		}



		dp_set_hw_test_pattern(link, test_pattern,

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

+12 −1
Original line number Diff line number Diff line
@@ -62,6 +62,13 @@ void dp_receiver_power_ctrl(struct dc_link *link, bool on) 
			sizeof(state));

}



void dp_source_sequence_trace(struct dc_link *link, uint8_t dp_test_mode)

{

	if (link->dc->debug.enable_driver_sequence_debug)

		core_link_write_dpcd(link, DP_SOURCE_SEQUENCE,

					&dp_test_mode, sizeof(dp_test_mode));

}



void dp_enable_link_phy(

	struct dc_link *link,

	enum signal_type signal,
@@ -158,6 +165,7 @@ void dp_enable_link_phy( 
	if (dmcu != NULL && dmcu->funcs->unlock_phy)

		dmcu->funcs->unlock_phy(dmcu);



	dp_source_sequence_trace(link, DPCD_SOURCE_SEQ_AFTER_ENABLE_LINK_PHY);

	dp_receiver_power_ctrl(link, true);

}
@@ -276,6 +284,8 @@ void dp_disable_link_phy(struct dc_link *link, enum signal_type signal) 
			dmcu->funcs->unlock_phy(dmcu);

	}



	dp_source_sequence_trace(link, DPCD_SOURCE_SEQ_AFTER_DISABLE_LINK_PHY);



	/* Clear current link setting.*/

	memset(&link->cur_link_settings, 0,

			sizeof(link->cur_link_settings));
@@ -407,6 +417,7 @@ void dp_set_hw_test_pattern( 
#else

	encoder->funcs->dp_set_phy_pattern(encoder, &pattern_param);

#endif

	dp_source_sequence_trace(link, DPCD_SOURCE_SEQ_AFTER_SET_SOURCE_PATTERN);

}

#if defined(CONFIG_DRM_AMD_DC_DCN)

#undef DC_LOGGER
@@ -428,7 +439,7 @@ void dp_retrain_link_dp_test(struct dc_link *link, 
			pipes[i].stream->link == link) {

			udelay(100);



			pipes[i].stream_res.stream_enc->funcs->dp_blank(

			pipes[i].stream_res.stream_enc->funcs->dp_blank(link,

					pipes[i].stream_res.stream_enc);



			/* disable any test pattern that might be active */

drivers/gpu/drm/amd/display/dc/dc.h

+1 −0
Original line number Diff line number Diff line
@@ -643,6 +643,7 @@ struct dc_debug_options { 
	bool force_enable_edp_fec;

	/* FEC/PSR1 sequence enable delay in 100us */

	uint8_t fec_enable_delay_in100us;

	bool enable_driver_sequence_debug;

#if defined(CONFIG_DRM_AMD_DC_DCN)

	bool disable_z10;

	bool enable_sw_cntl_psr;

drivers/gpu/drm/amd/display/dc/dce/dce_stream_encoder.c

+2 −0
Original line number Diff line number Diff line
@@ -919,6 +919,7 @@ static void dce110_stream_encoder_stop_dp_info_packets( 
}



static void dce110_stream_encoder_dp_blank(

	struct dc_link *link,

	struct stream_encoder *enc)

{

	struct dce110_stream_encoder *enc110 = DCE110STRENC_FROM_STRENC(enc);
@@ -967,6 +968,7 @@ static void dce110_stream_encoder_dp_blank( 


/* output video stream to link encoder */

static void dce110_stream_encoder_dp_unblank(

	struct dc_link *link,

	struct stream_encoder *enc,

	const struct encoder_unblank_param *param)

{