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

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

drm/tegra: Rename async to nonblock. 



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

Cc: Thierry Reding <thierry.reding@gmail.com>
Cc: "Terje Bergström" <tbergstrom@nvidia.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-10-git-send-email-maarten.lankhorst@linux.intel.com
parent ab575184

drivers/gpu/drm/tegra/drm.c

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



static int tegra_atomic_commit(struct drm_device *drm,

			       struct drm_atomic_state *state, bool async)

			       struct drm_atomic_state *state, bool nonblock)

{

	struct tegra_drm *tegra = drm->dev_private;

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

		return err;



	/* serialize outstanding asynchronous commits */

	/* serialize outstanding nonblocking commits */

	mutex_lock(&tegra->commit.lock);

	flush_work(&tegra->commit.work);
@@ -95,7 +95,7 @@ static int tegra_atomic_commit(struct drm_device *drm, 


	drm_atomic_helper_swap_state(drm, state);



	if (async)

	if (nonblock)

		tegra_atomic_schedule(tegra, state);

	else

		tegra_atomic_complete(tegra, state);