Skip to content

Commit 29a1c58

Browse files
Nicholas Kazlauskasalexdeucher
authored andcommitted
drm/amd/display: Disable OTG WA for the plane_state NULL case on DCN314
[Why] This shouldn't trigger during tiled display hotplug/unplug but it does because one of the tiles can end up with a NULL plane state. This also doesn't guard against the hang that it was originally trying to resolve, and can instead cause DIO corruption due to OTG sync being lost. [How] This was reverted at one point out of DCN31 so revert it here too. Reviewed-by: Dmytro Laktyushkin <[email protected]> Acked-by: Wayne Lin <[email protected]> Signed-off-by: Nicholas Kazlauskas <[email protected]> Tested-by: Daniel Wheeler <[email protected]> Signed-off-by: Alex Deucher <[email protected]>
1 parent f528fa3 commit 29a1c58

File tree

1 file changed

+1
-2
lines changed

1 file changed

+1
-2
lines changed

drivers/gpu/drm/amd/display/dc/clk_mgr/dcn314/dcn314_clk_mgr.c

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -129,8 +129,7 @@ static void dcn314_disable_otg_wa(struct clk_mgr *clk_mgr_base, struct dc_state
129129

130130
if (pipe->top_pipe || pipe->prev_odm_pipe)
131131
continue;
132-
if (pipe->stream && (pipe->stream->dpms_off || pipe->plane_state == NULL ||
133-
dc_is_virtual_signal(pipe->stream->signal))) {
132+
if (pipe->stream && (pipe->stream->dpms_off || dc_is_virtual_signal(pipe->stream->signal))) {
134133
if (disable) {
135134
pipe->stream_res.tg->funcs->immediate_disable_crtc(pipe->stream_res.tg);
136135
reset_sync_context_for_pipe(dc, context, i);

0 commit comments

Comments
 (0)