drm/amd/display: Only wait for flip pending on immediate flips

[Why]
We want to make sure all immediate flips are completed before locking
the pipes, but not pipes that are not flip immediate as they will be
locked by the OTG

[How]
Skip non flip immediate pipes when checking for flip pending.

Signed-off-by: Aric Cyr <aric.cyr@amd.com>
Acked-by: Bindu Ramamurthy <bindu.r@amd.com>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>

diff --git a/drivers/gpu/drm/amd/display/dc/dcn20/dcn20_hwseq.c b/drivers/gpu/drm/amd/display/dc/dcn20/dcn20_hwseq.c
index d8d45d860cb70b5e919f05f8dd1d17944460c48e..e65ec2a20fa2c66f3ff368bf67f0eb4486feb846 100644 (file)
--- a/drivers/gpu/drm/amd/display/dc/dcn20/dcn20_hwseq.c
+++ b/drivers/gpu/drm/amd/display/dc/dcn20/dcn20_hwseq.c
@@ -1165,27 +1165,28 @@ void dcn20_pipe_control_lock(
 
        temp_pipe = pipe->bottom_pipe;
        while (!flip_immediate && temp_pipe) {
-           if (temp_pipe->plane_state != NULL)
-               flip_immediate = temp_pipe->plane_state->flip_immediate;
-           temp_pipe = temp_pipe->bottom_pipe;
+               if (temp_pipe->plane_state != NULL)
+                       flip_immediate = temp_pipe->plane_state->flip_immediate;
+               temp_pipe = temp_pipe->bottom_pipe;
        }
 
        if (flip_immediate && lock) {
                const int TIMEOUT_FOR_FLIP_PENDING = 100000;
                int i;
 
-               for (i = 0; i < TIMEOUT_FOR_FLIP_PENDING; ++i) {
-                       if (!pipe->plane_res.hubp->funcs->hubp_is_flip_pending(pipe->plane_res.hubp))
-                               break;
-                       udelay(1);
-               }
-
-               if (pipe->bottom_pipe != NULL) {
-                       for (i = 0; i < TIMEOUT_FOR_FLIP_PENDING; ++i) {
-                               if (!pipe->bottom_pipe->plane_res.hubp->funcs->hubp_is_flip_pending(pipe->bottom_pipe->plane_res.hubp))
-                                       break;
-                               udelay(1);
+               temp_pipe = pipe;
+               while (temp_pipe) {
+                       if (temp_pipe->plane_state && temp_pipe->plane_state->flip_immediate) {
+                               for (i = 0; i < TIMEOUT_FOR_FLIP_PENDING; ++i) {
+                                       if (!temp_pipe->plane_res.hubp->funcs->hubp_is_flip_pending(temp_pipe->plane_res.hubp))
+                                               break;
+                                       udelay(1);
+                               }
+
+                               /* no reason it should take this long for immediate flips */
+                               ASSERT(i != TIMEOUT_FOR_FLIP_PENDING);
                        }
+                       temp_pipe = temp_pipe->bottom_pipe;
                }
        }