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

Commit ab575184 authored by Maarten Lankhorst's avatar Maarten Lankhorst Committed by Daniel Vetter
Browse files

drm/sti: Rename async to nonblock. 



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: default avatarMaarten Lankhorst <maarten.lankhorst@linux.intel.com>
Acked-by: default avatarVincent Abriou <vincent.abriou@st.com>
Signed-off-by: default avatarDaniel Vetter <daniel.vetter@ffwll.ch>
Link: http://patchwork.freedesktop.org/patch/msgid/1461679905-30177-9-git-send-email-maarten.lankhorst@linux.intel.com
parent 3302f358

drivers/gpu/drm/sti/sti_drv.c

+3 −3
Original line number Diff line number Diff line
@@ -202,7 +202,7 @@ static void sti_atomic_work(struct work_struct *work) 
}



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;

	int err;
@@ -211,7 +211,7 @@ static int sti_atomic_commit(struct drm_device *drm, 
	if (err)

		return err;



	/* serialize outstanding asynchronous commits */

	/* serialize outstanding nonblocking commits */

	mutex_lock(&private->commit.lock);

	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);



	if (async)

	if (nonblock)

		sti_atomic_schedule(private, state);

	else

		sti_atomic_complete(private, state);