leandrof/linux
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

drm/atomic-helpers: Clear up cleanup_done a bit

Browse Source 
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
This commit is contained in:
Daniel Vetter 2016-06-15 12:24:26 +02:00
parent 723c3e5530
commit 7deef7f1ae
1 changed files with 3 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
drivers/gpu/drm/drm_atomic_helper.c
View File

@ -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 /* commit_list borrows our reference, need to remove before we
* clean up our drm_atomic_state. But only after it actually * clean up our drm_atomic_state. But only after it actually
* completed, otherwise subsequent commits won't stall properly. */ * completed, otherwise subsequent commits won't stall properly. */
if (try_wait_for_completion(&commit->flip_done)) { if (try_wait_for_completion(&commit->flip_done))
list_del(&commit->commit_entry); goto del_commit;
spin_unlock(&crtc->commit_lock);
continue;
}
spin_unlock(&crtc->commit_lock); 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); crtc->base.id, crtc->name);
spin_lock(&crtc->commit_lock); spin_lock(&crtc->commit_lock);
del_commit:
list_del(&commit->commit_entry); list_del(&commit->commit_entry);
spin_unlock(&crtc->commit_lock); spin_unlock(&crtc->commit_lock);
} }