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

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

drm/omapdrm: Rename async to nonblock. 



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

Cc: Tomi Valkeinen <tomi.valkeinen@ti.com>
Signed-off-by: default avatarMaarten Lankhorst <maarten.lankhorst@linux.intel.com>
Signed-off-by: default avatarDaniel Vetter <daniel.vetter@ffwll.ch>
Link: http://patchwork.freedesktop.org/patch/msgid/1461679905-30177-7-git-send-email-maarten.lankhorst@linux.intel.com
parent a3ccfb9f

drivers/gpu/drm/omapdrm/omap_drv.c

+2 −2
Original line number Diff line number Diff line
@@ -138,7 +138,7 @@ static bool omap_atomic_is_pending(struct omap_drm_private *priv, 
}



static int omap_atomic_commit(struct drm_device *dev,

			      struct drm_atomic_state *state, bool async)

			      struct drm_atomic_state *state, bool nonblock)

{

	struct omap_drm_private *priv = dev->dev_private;

	struct omap_atomic_state_commit *commit;
@@ -177,7 +177,7 @@ static int omap_atomic_commit(struct drm_device *dev, 
	/* Swap the state, this is the point of no return. */

	drm_atomic_helper_swap_state(dev, state);



	if (async)

	if (nonblock)

		schedule_work(&commit->work);

	else

		omap_atomic_complete(commit);