summaryrefslogtreecommitdiffstats
path: root/drivers/gpu/drm/drm_atomic_helper.c
diff options
context:
space:
mode:
authorMaarten Lankhorst2016-04-26 16:11:35 +0200
committerDaniel Vetter2016-05-02 16:36:03 +0200
commitb837ba0ad95bb5c08626a49321f07f271bdaf512 (patch)
tree1cdd24b70057070dddecf544f7fc8e0b8494f003 /drivers/gpu/drm/drm_atomic_helper.c
parentdrm/atomic: Rename async parameter to nonblocking. (diff)
downloadkernel-qcow2-linux-b837ba0ad95bb5c08626a49321f07f271bdaf512.tar.gz
kernel-qcow2-linux-b837ba0ad95bb5c08626a49321f07f271bdaf512.tar.xz
kernel-qcow2-linux-b837ba0ad95bb5c08626a49321f07f271bdaf512.zip
drm/atomic: Rename drm_atomic_async_commit to nonblocking.
Another step in renaming async to nonblocking for atomic commit. Signed-off-by: Maarten Lankhorst <maarten.lankhorst@linux.intel.com> Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch> Link: http://patchwork.freedesktop.org/patch/msgid/1461679905-30177-3-git-send-email-maarten.lankhorst@linux.intel.com
Diffstat (limited to 'drivers/gpu/drm/drm_atomic_helper.c')
-rw-r--r--drivers/gpu/drm/drm_atomic_helper.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/gpu/drm/drm_atomic_helper.c b/drivers/gpu/drm/drm_atomic_helper.c
index 297713bab549..b04662e0e608 100644
--- a/drivers/gpu/drm/drm_atomic_helper.c
+++ b/drivers/gpu/drm/drm_atomic_helper.c
@@ -2371,11 +2371,11 @@ retry:
goto fail;
}
- ret = drm_atomic_async_commit(state);
+ ret = drm_atomic_nonblocking_commit(state);
if (ret != 0)
goto fail;
- /* Driver takes ownership of state on successful async commit. */
+ /* Driver takes ownership of state on successful commit. */
return 0;
fail:
if (ret == -EDEADLK)