Commit 8acd9754 authored by sungwang's avatar sungwang Committed by Alex Deucher
Browse files

drm/amd/display: Fix ODM combine issue with fast boot 



[Why]
When systme power up and eDP lit up by VBIOS,
in the core_link_enable_stream(),
the function will early return due to apply
apply_edp_fast_boot_optimization,
resulting the DP_PIXEL_COMBINE cannot get set
in enc3_dp_set_odm_combine.

[How]
Check ODM PIPE to avoid early return.

Reviewed-by: default avatarDmytro Laktyushkin <Dmytro.Laktyushkin@amd.com>
Acked-by: default avatarQingqing Zhuo <qingqing.zhuo@amd.com>
Signed-off-by: default avatarDanny Wang <danny.wang@amd.com>
Tested-by: default avatarDaniel Wheeler <daniel.wheeler@amd.com>
Signed-off-by: default avatarAlex Deucher <alexander.deucher@amd.com>
parent ae6c9601

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

+2 −1
Original line number Diff line number Diff line
@@ -4285,7 +4285,8 @@ void core_link_enable_stream( 
		/* eDP lit up by bios already, no need to enable again. */

		if (pipe_ctx->stream->signal == SIGNAL_TYPE_EDP &&

					apply_edp_fast_boot_optimization &&

					!pipe_ctx->stream->timing.flags.DSC) {

					!pipe_ctx->stream->timing.flags.DSC &&

					!pipe_ctx->next_odm_pipe) {

			pipe_ctx->stream->dpms_off = false;

#if defined(CONFIG_DRM_AMD_DC_HDCP)

			update_psp_stream_config(pipe_ctx, false);