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

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

drm/atomic: Rename drm_atomic_async_commit to nonblocking. 



Another step in renaming async to nonblocking for atomic commit.

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-3-git-send-email-maarten.lankhorst@linux.intel.com
parent 286dbb8d

drivers/gpu/drm/drm_atomic.c

+6 −6
Original line number Diff line number Diff line
@@ -145,7 +145,7 @@ void drm_atomic_state_default_clear(struct drm_atomic_state *state) 
			continue;



		/*

		 * FIXME: Async commits can race with connector unplugging and

		 * FIXME: Nonblocking commits can race with connector unplugging and

		 * there's currently nothing that prevents cleanup up state for

		 * deleted connectors. As long as the callback doesn't look at

		 * the connector we'll be fine though, so make sure that's the
@@ -1390,7 +1390,7 @@ int drm_atomic_commit(struct drm_atomic_state *state) 
EXPORT_SYMBOL(drm_atomic_commit);



/**

 * drm_atomic_async_commit - atomic&async configuration commit

 * drm_atomic_nonblocking_commit - atomic&nonblocking configuration commit

 * @state: atomic configuration to check

 *

 * Note that this function can return -EDEADLK if the driver needed to acquire
@@ -1405,7 +1405,7 @@ EXPORT_SYMBOL(drm_atomic_commit); 
 * Returns:

 * 0 on success, negative error code on failure.

 */

int drm_atomic_async_commit(struct drm_atomic_state *state)

int drm_atomic_nonblocking_commit(struct drm_atomic_state *state)

{

	struct drm_mode_config *config = &state->dev->mode_config;

	int ret;
@@ -1414,11 +1414,11 @@ int drm_atomic_async_commit(struct drm_atomic_state *state) 
	if (ret)

		return ret;



	DRM_DEBUG_ATOMIC("commiting %p asynchronously\n", state);

	DRM_DEBUG_ATOMIC("commiting %p nonblocking\n", state);



	return config->funcs->atomic_commit(state->dev, state, true);

}

EXPORT_SYMBOL(drm_atomic_async_commit);

EXPORT_SYMBOL(drm_atomic_nonblocking_commit);



/*

 * The big monstor ioctl
@@ -1687,7 +1687,7 @@ int drm_mode_atomic_ioctl(struct drm_device *dev, 
		 */

		ret = drm_atomic_check_only(state);

	} else if (arg->flags & DRM_MODE_ATOMIC_NONBLOCK) {

		ret = drm_atomic_async_commit(state);

		ret = drm_atomic_nonblocking_commit(state);

	} else {

		ret = drm_atomic_commit(state);

	}

drivers/gpu/drm/drm_atomic_helper.c

+2 −2
Original line number Diff line number Diff line
@@ -2371,11 +2371,11 @@ int drm_atomic_helper_page_flip(struct drm_crtc *crtc, 
		goto fail;

	}



	ret = drm_atomic_async_commit(state);

	ret = drm_atomic_nonblocking_commit(state);

	if (ret != 0)

		goto fail;



	/* Driver takes ownership of state on successful async commit. */

	/* Driver takes ownership of state on successful commit. */

	return 0;

fail:

	if (ret == -EDEADLK)

include/drm/drm_atomic.h

+1 −1
Original line number Diff line number Diff line
@@ -137,7 +137,7 @@ drm_atomic_clean_old_fb(struct drm_device *dev, unsigned plane_mask, int ret); 


int __must_check drm_atomic_check_only(struct drm_atomic_state *state);

int __must_check drm_atomic_commit(struct drm_atomic_state *state);

int __must_check drm_atomic_async_commit(struct drm_atomic_state *state);

int __must_check drm_atomic_nonblocking_commit(struct drm_atomic_state *state);



#define for_each_connector_in_state(state, connector, connector_state, __i) \

	for ((__i) = 0;							\