Commit 2d6870d3 authored Aug 10, 2020 by Jaehyun Chung Committed by Alex Deucher Aug 26, 2020

drm/amd/display: Revert HDCP disable sequence change



[Why]
Revert HDCP disable sequence change that blanks stream before
disabling HDCP. PSP and HW teams are currently investigating the
root cause of why HDCP cannot be disabled before stream blank,
which is expected to work without issues.

Signed-off-by: Jaehyun Chung <jaehyun.chung@amd.com>
Reviewed-by: Wenjing Liu <Wenjing.Liu@amd.com>
Acked-by: Eryk Brol <eryk.brol@amd.com>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>

parent 75f77aaf

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

+1 −1

Original line number	Diff line number	Diff line
		@@ -3286,10 +3286,10 @@ void core_link_disable_stream(struct pipe_ctx *pipe_ctx)
		core_link_set_avmute(pipe_ctx, true);
		}

		dc->hwss.blank_stream(pipe_ctx);
		#if defined(CONFIG_DRM_AMD_DC_HDCP)
		update_psp_stream_config(pipe_ctx, true);
		#endif
		dc->hwss.blank_stream(pipe_ctx);

		if (pipe_ctx->stream->signal == SIGNAL_TYPE_DISPLAY_PORT_MST)
		deallocate_mst_payload(pipe_ctx);