Revert "drm/amd/display: Signal hw_done() after waiting for flip_done()"

This reverts commit 717276b9256f5d97b43e53adca1670cee2c45db2.

The reverted patch was a workaround that addressed an issue fixed by:
4364bcb2cd21 ("drm: Get ref on CRTC commit object when waiting for
flip_done")

Signed-off-by: Leo Li <sunpeng.li@amd.com>
Reviewed-by: Nicholas Kazlauskas <Nicholas.Kazlauskas@amd.com>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>

diff --git a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c
index 1059189229ea62e3e8d9134238c85b1e0c2493e8..ff2fcb99ac63da8e60c1e28cb2dbff4b6dff4076 100644 (file)
--- a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c
+++ b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c
@@ -5257,18 +5257,12 @@ static void amdgpu_dm_atomic_commit_tail(struct drm_atomic_state *state)
        }
        spin_unlock_irqrestore(&adev->ddev->event_lock, flags);
 
+       /* Signal HW programming completion */
+       drm_atomic_helper_commit_hw_done(state);
 
        if (wait_for_vblank)
                drm_atomic_helper_wait_for_flip_done(dev, state);
 
-       /*
-        * FIXME:
-        * Delay hw_done() until flip_done() is signaled. This is to block
-        * another commit from freeing the CRTC state while we're still
-        * waiting on flip_done.
-        */
-       drm_atomic_helper_commit_hw_done(state);
-
        drm_atomic_helper_cleanup_planes(dev, state);
 
        /*