Commit 29c8f234 authored by Leo Li's avatar Leo Li Committed by Alex Deucher
Browse files

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



This reverts commit 717276b9.

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

Signed-off-by: default avatarLeo Li <sunpeng.li@amd.com>
Reviewed-by: default avatarNicholas Kazlauskas <Nicholas.Kazlauskas@amd.com>
Signed-off-by: default avatarAlex Deucher <alexander.deucher@amd.com>
parent a6729a5a
Loading
Loading
Loading
Loading
+2 −8
Original line number Diff line number Diff line
@@ -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);

	/*