Commit b0d88890 authored by Wenjing Liu's avatar Wenjing Liu Committed by Alex Deucher
Browse files

drm/amd/display: use correct vpg instance for 128b/132b encoding 



[why]
128b/132b uses the vpg instance assigned to hpo dp stream encoder.
The current vpg used is assigned to dio stream encoder.
This is incorrect and cause display black screen because the
actual vpg is powered off.

Reviewed-by: default avatarMichael Strauss <michael.strauss@amd.com>
Acked-by: default avatarAnson Jacob <Anson.Jacob@amd.com>
Signed-off-by: default avatarWenjing Liu <wenjing.liu@amd.com>
Tested-by: default avatarDaniel Wheeler <daniel.wheeler@amd.com>
Signed-off-by: default avatarAlex Deucher <alexander.deucher@amd.com>
parent e7947476

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

+6 −0
Original line number Diff line number Diff line
@@ -3608,6 +3608,9 @@ void core_link_enable_stream( 
#if defined(CONFIG_DRM_AMD_DC_DCN)

	enum otg_out_mux_dest otg_out_dest = OUT_MUX_DIO;

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



	if (is_dp_128b_132b_signal(pipe_ctx))

		vpg = pipe_ctx->stream_res.hpo_dp_stream_enc->vpg;

#endif

	DC_LOGGER_INIT(pipe_ctx->stream->ctx->logger);
@@ -3853,6 +3856,9 @@ void core_link_disable_stream(struct pipe_ctx *pipe_ctx) 
	struct dc_link *link = stream->sink->link;

#if defined(CONFIG_DRM_AMD_DC_DCN)

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



	if (is_dp_128b_132b_signal(pipe_ctx))

		vpg = pipe_ctx->stream_res.hpo_dp_stream_enc->vpg;

#endif



	if (!IS_DIAG_DC(dc->ctx->dce_environment) &&