Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

drm/amd/display: Revert "avoid disable otg when dig was disabled"

This reverts commit 7cf5ceb30d4d527d763ae78c5405e3faca1fb8b1.

Acked-by: Alex Hung <alex.hung@amd.com>
Signed-off-by: Aric Cyr <aric.cyr@amd.com>
Tested-by: Daniel Wheeler <daniel.wheeler@amd.com>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>

authored by

Aric Cyr and committed by
Alex Deucher
b07bb766 ed9ca86b

+6 -20
+6 -20
drivers/gpu/drm/amd/display/dc/clk_mgr/dcn315/dcn315_clk_mgr.c
··· 87 87 return display_count; 88 88 } 89 89 90 - bool should_disable_otg(struct pipe_ctx *pipe) 91 - { 92 - bool ret = true; 93 - 94 - if (pipe->stream->link->link_enc && pipe->stream->link->link_enc->funcs->is_dig_enabled && 95 - pipe->stream->link->link_enc->funcs->is_dig_enabled(pipe->stream->link->link_enc)) 96 - ret = false; 97 - return ret; 98 - } 99 - 100 90 static void dcn315_disable_otg_wa(struct clk_mgr *clk_mgr_base, struct dc_state *context, bool disable) 101 91 { 102 92 struct dc *dc = clk_mgr_base->ctx->dc; ··· 98 108 if (pipe->top_pipe || pipe->prev_odm_pipe) 99 109 continue; 100 110 if (pipe->stream && (pipe->stream->dpms_off || pipe->plane_state == NULL || 101 - dc_is_virtual_signal(pipe->stream->signal))) { 102 - 103 - /* This w/a should not trigger when we have a dig active */ 104 - if (should_disable_otg(pipe)) { 105 - if (disable) { 106 - pipe->stream_res.tg->funcs->immediate_disable_crtc(pipe->stream_res.tg); 107 - reset_sync_context_for_pipe(dc, context, i); 108 - } else 109 - pipe->stream_res.tg->funcs->enable_crtc(pipe->stream_res.tg); 110 - } 111 + dc_is_virtual_signal(pipe->stream->signal))) { 112 + if (disable) { 113 + pipe->stream_res.tg->funcs->immediate_disable_crtc(pipe->stream_res.tg); 114 + reset_sync_context_for_pipe(dc, context, i); 115 + } else 116 + pipe->stream_res.tg->funcs->enable_crtc(pipe->stream_res.tg); 111 117 } 112 118 } 113 119 }