Commit 82a10aff authored by Aric Cyr's avatar Aric Cyr Committed by Alex Deucher
Browse files

drm/amd/display: Only wait for blank completion if OTG active 



[why]
If OTG is not active, waiting for blank completion will always fail and
timeout resulting in unnecessary driver delays.

[how]
Check that OTG is enabled before waiting for blank.

Reviewed-by: default avatarAlvin Lee <Alvin.Lee2@amd.com>
Acked-by: default avatarQingqing Zhuo <qingqing.zhuo@amd.com>
Signed-off-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 f3f8f16b

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

+3 −1
Original line number Diff line number Diff line
@@ -1093,6 +1093,7 @@ static void phantom_pipe_blank( 
			otg_active_height,

			0);



	if (tg->funcs->is_tg_enabled(tg))

		hws->funcs.wait_for_blank_complete(opp);

}
@@ -1156,6 +1157,7 @@ static void disable_dangling_plane(struct dc *dc, struct dc_state *context) 
			if (old_stream->mall_stream_config.type == SUBVP_PHANTOM) {

				if (tg->funcs->enable_crtc) {

					int main_pipe_width, main_pipe_height;



					main_pipe_width = old_stream->mall_stream_config.paired_stream->dst.width;

					main_pipe_height = old_stream->mall_stream_config.paired_stream->dst.height;

					phantom_pipe_blank(dc, tg, main_pipe_width, main_pipe_height);