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

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

drm/vc4: Rename async to nonblock. 



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

Cc: Eric Anholt <eric@anholt.net>
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-12-git-send-email-maarten.lankhorst@linux.intel.com
parent 8beafe02

drivers/gpu/drm/vc4/vc4_kms.c

+3 −3
Original line number Diff line number Diff line
@@ -93,7 +93,7 @@ static struct vc4_commit *commit_init(struct drm_atomic_state *state) 
 * vc4_atomic_commit - commit validated state object

 * @dev: DRM device

 * @state: the driver state object

 * @async: asynchronous commit

 * @nonblock: nonblocking commit

 *

 * This function commits a with drm_atomic_helper_check() pre-validated state

 * object. This can still fail when e.g. the framebuffer reservation fails. For
@@ -104,7 +104,7 @@ static struct vc4_commit *commit_init(struct drm_atomic_state *state) 
 */

static int vc4_atomic_commit(struct drm_device *dev,

			     struct drm_atomic_state *state,

			     bool async)

			     bool nonblock)

{

	struct vc4_dev *vc4 = to_vc4_dev(dev);

	int ret;
@@ -170,7 +170,7 @@ static int vc4_atomic_commit(struct drm_device *dev, 
	 * current layout.

	 */



	if (async) {

	if (nonblock) {

		vc4_queue_seqno_cb(dev, &c->cb, wait_seqno,

				   vc4_atomic_complete_commit_seqno_cb);

	} else {