Commit d0e9de7a authored by Alex Deucher's avatar Alex Deucher
Browse files

Revert "drm/amd/display: Move setup_stream_attribute" 

This reverts commit 2681bf4a.

This results in a blank screen on the HDMI port on some systems.
Revert for now so as not to regress 6.18, can be addressed
in 6.19 once the issue is root caused.

Closes: https://gitlab.freedesktop.org/drm/amd/-/issues/4652


Cc: Sunpeng.Li@amd.com
Cc: ivan.lipski@amd.com
Signed-off-by: default avatarAlex Deucher <alexander.deucher@amd.com>
parent e60573b5

drivers/gpu/drm/amd/display/dc/hwss/dce110/dce110_hwseq.c

+0 −1
Original line number Diff line number Diff line
@@ -685,7 +685,6 @@ void dce110_enable_stream(struct pipe_ctx *pipe_ctx) 
	uint32_t early_control = 0;

	struct timing_generator *tg = pipe_ctx->stream_res.tg;



	link_hwss->setup_stream_attribute(pipe_ctx);

	link_hwss->setup_stream_encoder(pipe_ctx);



	dc->hwss.update_info_frame(pipe_ctx);

drivers/gpu/drm/amd/display/dc/hwss/dcn20/dcn20_hwseq.c

+0 −2
Original line number Diff line number Diff line
@@ -3063,8 +3063,6 @@ void dcn20_enable_stream(struct pipe_ctx *pipe_ctx) 
						      link_enc->transmitter - TRANSMITTER_UNIPHY_A);

	}



	link_hwss->setup_stream_attribute(pipe_ctx);



	if (dc->res_pool->dccg->funcs->set_pixel_rate_div)

		dc->res_pool->dccg->funcs->set_pixel_rate_div(

			dc->res_pool->dccg,

drivers/gpu/drm/amd/display/dc/hwss/dcn401/dcn401_hwseq.c

+0 −2
Original line number Diff line number Diff line
@@ -974,8 +974,6 @@ void dcn401_enable_stream(struct pipe_ctx *pipe_ctx) 
		}

	}



	link_hwss->setup_stream_attribute(pipe_ctx);



	if (dc->res_pool->dccg->funcs->set_pixel_rate_div) {

		dc->res_pool->dccg->funcs->set_pixel_rate_div(

			dc->res_pool->dccg,

drivers/gpu/drm/amd/display/dc/link/link_dpms.c

+3 −0
Original line number Diff line number Diff line
@@ -2467,6 +2467,7 @@ void link_set_dpms_on( 
	struct link_encoder *link_enc = pipe_ctx->link_res.dio_link_enc;

	enum otg_out_mux_dest otg_out_dest = OUT_MUX_DIO;

	struct vpg *vpg = pipe_ctx->stream_res.stream_enc->vpg;

	const struct link_hwss *link_hwss = get_link_hwss(link, &pipe_ctx->link_res);

	bool apply_edp_fast_boot_optimization =

		pipe_ctx->stream->apply_edp_fast_boot_optimization;
@@ -2511,6 +2512,8 @@ void link_set_dpms_on( 
		pipe_ctx->stream_res.tg->funcs->set_out_mux(pipe_ctx->stream_res.tg, otg_out_dest);

	}



	link_hwss->setup_stream_attribute(pipe_ctx);



	pipe_ctx->stream->apply_edp_fast_boot_optimization = false;



	// Enable VPG before building infoframe

drivers/gpu/drm/amd/display/dc/virtual/virtual_stream_encoder.c

+0 −7
Original line number Diff line number Diff line
@@ -44,11 +44,6 @@ static void virtual_stream_encoder_dvi_set_stream_attribute( 
	struct dc_crtc_timing *crtc_timing,

	bool is_dual_link) {}



static void virtual_stream_encoder_lvds_set_stream_attribute(

	struct stream_encoder *enc,

	struct dc_crtc_timing *crtc_timing)

{}



static void virtual_stream_encoder_set_throttled_vcp_size(

	struct stream_encoder *enc,

	struct fixed31_32 avg_time_slots_per_mtp)
@@ -120,8 +115,6 @@ static const struct stream_encoder_funcs virtual_str_enc_funcs = { 
		virtual_stream_encoder_hdmi_set_stream_attribute,

	.dvi_set_stream_attribute =

		virtual_stream_encoder_dvi_set_stream_attribute,

	.lvds_set_stream_attribute =

		virtual_stream_encoder_lvds_set_stream_attribute,

	.set_throttled_vcp_size =

		virtual_stream_encoder_set_throttled_vcp_size,

	.update_hdmi_info_packets =