Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 7deef7f1 authored by Daniel Vetter's avatar Daniel Vetter
Browse files

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: default avatar <Liviu.Dudau@arm.com>
Signed-off-by: default avatarDaniel Vetter <daniel.vetter@intel.com>
Signed-off-by: default avatarDaniel Vetter <daniel.vetter@ffwll.ch>
Link: http://patchwork.freedesktop.org/patch/msgid/1465986266-2831-1-git-send-email-daniel.vetter@ffwll.ch
parent 723c3e55

drivers/gpu/drm/drm_atomic_helper.c

+3 −5
Original line number Diff line number Diff line
@@ -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);

	}