drm/atomic-helpers: Clear up cleanup_done a bit

It's not obvious at first sight that this is a fastpath, make that
clearer with a goto. Fallout from a discussion with Liviu on irc.

v2: Drop bogus hunks that crept in.

v3: Make it compile.

Cc: Liviu.Dudau@arm.com
Acked-by: Liviu.Dudau@arm.com
Signed-off-by: Daniel Vetter <daniel.vetter@intel.com>
Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
Link: http://patchwork.freedesktop.org/patch/msgid/1465986266-2831-1-git-send-email-daniel.vetter@ffwll.ch

diff --git a/drivers/gpu/drm/drm_atomic_helper.c b/drivers/gpu/drm/drm_atomic_helper.c
index 716aa535eb98515c48bd3e3b10041e4e5394956d..de7fddce3cefac5a00de3fb95b94578585b9ce8d 100644 (file)
--- a/drivers/gpu/drm/drm_atomic_helper.c
+++ b/drivers/gpu/drm/drm_atomic_helper.c
@@ -1579,11 +1579,8 @@ void drm_atomic_helper_commit_cleanup_done(struct drm_atomic_state *state)
                /* commit_list borrows our reference, need to remove before we
                 * clean up our drm_atomic_state. But only after it actually
                 * completed, otherwise subsequent commits won't stall properly. */
-               if (try_wait_for_completion(&commit->flip_done)) {
-                       list_del(&commit->commit_entry);
-                       spin_unlock(&crtc->commit_lock);
-                       continue;
-               }
+               if (try_wait_for_completion(&commit->flip_done))
+                       goto del_commit;
 
                spin_unlock(&crtc->commit_lock);
 
@@ -1597,6 +1594,7 @@ void drm_atomic_helper_commit_cleanup_done(struct drm_atomic_state *state)
                                  crtc->base.id, crtc->name);
 
                spin_lock(&crtc->commit_lock);
+del_commit:
                list_del(&commit->commit_entry);
                spin_unlock(&crtc->commit_lock);
        }