Skip to content

Commit 82a10af

Browse files
AMD-aricalexdeucher
authored andcommitted
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: Alvin Lee <[email protected]> Acked-by: Qingqing Zhuo <[email protected]> Signed-off-by: Aric Cyr <[email protected]> Tested-by: Daniel Wheeler <[email protected]> Signed-off-by: Alex Deucher <[email protected]>
1 parent f3f8f16 commit 82a10af

File tree

1 file changed

+3
-1
lines changed
  • drivers/gpu/drm/amd/display/dc/core

1 file changed

+3
-1
lines changed

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

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1093,7 +1093,8 @@ static void phantom_pipe_blank(
10931093
otg_active_height,
10941094
0);
10951095

1096-
hws->funcs.wait_for_blank_complete(opp);
1096+
if (tg->funcs->is_tg_enabled(tg))
1097+
hws->funcs.wait_for_blank_complete(opp);
10971098
}
10981099

10991100
static void disable_dangling_plane(struct dc *dc, struct dc_state *context)
@@ -1156,6 +1157,7 @@ static void disable_dangling_plane(struct dc *dc, struct dc_state *context)
11561157
if (old_stream->mall_stream_config.type == SUBVP_PHANTOM) {
11571158
if (tg->funcs->enable_crtc) {
11581159
int main_pipe_width, main_pipe_height;
1160+
11591161
main_pipe_width = old_stream->mall_stream_config.paired_stream->dst.width;
11601162
main_pipe_height = old_stream->mall_stream_config.paired_stream->dst.height;
11611163
phantom_pipe_blank(dc, tg, main_pipe_width, main_pipe_height);

0 commit comments

Comments
 (0)