|
@@ -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 @@ retry:
|
|
|
*/
|
|
|
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);
|
|
|
}
|