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

drm/sti: Rename async to nonblock.

Browse Source 
The async name is deprecated and should be changed to nonblocking.

Cc: Benjamin Gaignard <benjamin.gaignard@linaro.org>
Cc: Vincent Abriou <vincent.abriou@st.com>
Signed-off-by: Maarten Lankhorst <maarten.lankhorst@linux.intel.com>
Acked-by: Vincent Abriou <vincent.abriou@st.com>
Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
Link: http://patchwork.freedesktop.org/patch/msgid/1461679905-30177-9-git-send-email-maarten.lankhorst@linux.intel.com
This commit is contained in:
Maarten Lankhorst 2016-04-26 16:11:41 +02:00 committed by Daniel Vetter
parent 3302f3586f
commit ab57518425
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
drivers/gpu/drm/sti/sti_drv.c
View File

@ -202,7 +202,7 @@ static void sti_atomic_work(struct work_struct *work)
} }
static int sti_atomic_commit(struct drm_device *drm, static int sti_atomic_commit(struct drm_device *drm,
struct drm_atomic_state *state, bool async) struct drm_atomic_state *state, bool nonblock)
{ {
struct sti_private *private = drm->dev_private; struct sti_private *private = drm->dev_private;
int err; int err;
@ -211,7 +211,7 @@ static int sti_atomic_commit(struct drm_device *drm,
if (err) if (err)
return err; return err;
/* serialize outstanding asynchronous commits */ /* serialize outstanding nonblocking commits */
mutex_lock(&private->commit.lock); mutex_lock(&private->commit.lock);
flush_work(&private->commit.work); flush_work(&private->commit.work);
@ -223,7 +223,7 @@ static int sti_atomic_commit(struct drm_device *drm,
drm_atomic_helper_swap_state(drm, state); drm_atomic_helper_swap_state(drm, state);
if (async) if (nonblock)
sti_atomic_schedule(private, state); sti_atomic_schedule(private, state);
else else
sti_atomic_complete(private, state); sti_atomic_complete(private, state);