[PATCH 06/31] drm/amd/display: Wrap OTG disable workaround with FIFO control

[Jasdeep Dhillon]

From: Nicholas Kazlauskas <nicholas.kazlaus...@amd.com>

[Why]
The DIO FIFO will underflow if we turn off the OTG before we turn
off the FIFO.

Since this happens as part of the OTG workaround and we don't reset
the FIFO afterwards we see the error persist.

[How]
Add disable FIFO before the disable CRTC and enable FIFO after enabling
the CRTC.

Reviewed-by: Syed Hassan <syed.has...@amd.com>
Acked-by: Jasdeep Dhillon <jdhil...@amd.com>
Signed-off-by: Nicholas Kazlauskas <nicholas.kazlaus...@amd.com>
---
 .../amd/display/dc/clk_mgr/dcn314/dcn314_clk_mgr.c    | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

diff --git a/drivers/gpu/drm/amd/display/dc/clk_mgr/dcn314/dcn314_clk_mgr.c 
b/drivers/gpu/drm/amd/display/dc/clk_mgr/dcn314/dcn314_clk_mgr.c
index 193a0f3de18d..1131c6d73f6c 100644
--- a/drivers/gpu/drm/amd/display/dc/clk_mgr/dcn314/dcn314_clk_mgr.c
+++ b/drivers/gpu/drm/amd/display/dc/clk_mgr/dcn314/dcn314_clk_mgr.c
@@ -137,11 +137,20 @@ static void dcn314_disable_otg_wa(struct clk_mgr 
*clk_mgr_base, struct dc_state
                if (pipe->top_pipe || pipe->prev_odm_pipe)
                        continue;
                if (pipe->stream && (pipe->stream->dpms_off || 
dc_is_virtual_signal(pipe->stream->signal))) {
+                       struct stream_encoder *stream_enc = 
pipe->stream_res.stream_enc;
+
                        if (disable) {
+                               if (stream_enc && 
stream_enc->funcs->disable_fifo)
+                                       
pipe->stream_res.stream_enc->funcs->disable_fifo(stream_enc);
+
                                
pipe->stream_res.tg->funcs->immediate_disable_crtc(pipe->stream_res.tg);
                                reset_sync_context_for_pipe(dc, context, i);
-                       } else
+                       } else {
                                
pipe->stream_res.tg->funcs->enable_crtc(pipe->stream_res.tg);
+
+                               if (stream_enc && 
stream_enc->funcs->enable_fifo)
+                                       
pipe->stream_res.stream_enc->funcs->enable_fifo(stream_enc);
+                       }
                }
        }
 }
-- 
2.25.1