AcoSail/kernel_optimize_test
8
0
Fork 0
forked from luck/tmp_suning_uos_patched
Code Pull Requests Activity

drm/atomic: Rename drm_atomic_async_commit to nonblocking.

Browse Source 
Another step in renaming async to nonblocking for atomic commit.

Signed-off-by: Maarten Lankhorst <maarten.lankhorst@linux.intel.com>
Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
Link: http://patchwork.freedesktop.org/patch/msgid/1461679905-30177-3-git-send-email-maarten.lankhorst@linux.intel.com
This commit is contained in:
Maarten Lankhorst 2016-04-26 16:11:35 +02:00 committed by Daniel Vetter
parent 286dbb8d5d
commit b837ba0ad9
3 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
drivers/gpu/drm/drm_atomic.c
View File

@ -145,7 +145,7 @@ void drm_atomic_state_default_clear(struct drm_atomic_state *state)
continue; 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 * there's currently nothing that prevents cleanup up state for
* deleted connectors. As long as the callback doesn't look at * deleted connectors. As long as the callback doesn't look at
* the connector we'll be fine though, so make sure that's the * 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); 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 * @state: atomic configuration to check
* *
* Note that this function can return -EDEADLK if the driver needed to acquire * Note that this function can return -EDEADLK if the driver needed to acquire
@ -1405,7 +1405,7 @@ EXPORT_SYMBOL(drm_atomic_commit);
* Returns: * Returns:
* 0 on success, negative error code on failure. * 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; struct drm_mode_config *config = &state->dev->mode_config;
int ret; int ret;
@ -1414,11 +1414,11 @@ int drm_atomic_async_commit(struct drm_atomic_state *state)
if (ret) if (ret)
return 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); 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 * The big monstor ioctl
@ -1687,7 +1687,7 @@ int drm_mode_atomic_ioctl(struct drm_device *dev,
*/ */
ret = drm_atomic_check_only(state); ret = drm_atomic_check_only(state);
} else if (arg->flags & DRM_MODE_ATOMIC_NONBLOCK) { } else if (arg->flags & DRM_MODE_ATOMIC_NONBLOCK) {
ret = drm_atomic_async_commit(state); ret = drm_atomic_nonblocking_commit(state);
} else { } else {
ret = drm_atomic_commit(state); ret = drm_atomic_commit(state);
} }

4
drivers/gpu/drm/drm_atomic_helper.c
View File

@ -2371,11 +2371,11 @@ int drm_atomic_helper_page_flip(struct drm_crtc *crtc,
goto fail; goto fail;
} }
ret = drm_atomic_async_commit(state); ret = drm_atomic_nonblocking_commit(state);
if (ret != 0) if (ret != 0)
goto fail; goto fail;
/* Driver takes ownership of state on successful async commit. */ /* Driver takes ownership of state on successful commit. */
return 0; return 0;
fail: fail:
if (ret == -EDEADLK) if (ret == -EDEADLK)

2
include/drm/drm_atomic.h
View File

@ -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_check_only(struct drm_atomic_state *state);
int __must_check drm_atomic_commit(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) \ #define for_each_connector_in_state(state, connector, connector_state, __i) \
for ((__i) = 0; \ for ((__i) = 0; \