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

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

drm/rockchip: Rename async to nonblock. 



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

Cc: Mark Yao <mark.yao@rock-chips.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-11-git-send-email-maarten.lankhorst@linux.intel.com
parent 2dacdd70

drivers/gpu/drm/rockchip/rockchip_drm_fb.c

+3 −3
Original line number Diff line number Diff line
@@ -276,7 +276,7 @@ void rockchip_drm_atomic_work(struct work_struct *work) 


int rockchip_drm_atomic_commit(struct drm_device *dev,

			       struct drm_atomic_state *state,

			       bool async)

			       bool nonblock)

{

	struct rockchip_drm_private *private = dev->dev_private;

	struct rockchip_atomic_commit *commit = &private->commit;
@@ -286,7 +286,7 @@ int rockchip_drm_atomic_commit(struct drm_device *dev, 
	if (ret)

		return ret;



	/* serialize outstanding asynchronous commits */

	/* serialize outstanding nonblocking commits */

	mutex_lock(&commit->lock);

	flush_work(&commit->work);
@@ -295,7 +295,7 @@ int rockchip_drm_atomic_commit(struct drm_device *dev, 
	commit->dev = dev;

	commit->state = state;



	if (async)

	if (nonblock)

		schedule_work(&commit->work);

	else

		rockchip_atomic_commit_complete(commit);