|
@@ -93,7 +93,7 @@ static struct vc4_commit *commit_init(struct drm_atomic_state *state)
|
|
* vc4_atomic_commit - commit validated state object
|
|
* vc4_atomic_commit - commit validated state object
|
|
* @dev: DRM device
|
|
* @dev: DRM device
|
|
* @state: the driver state object
|
|
* @state: the driver state object
|
|
- * @async: asynchronous commit
|
|
|
|
|
|
+ * @nonblock: nonblocking commit
|
|
*
|
|
*
|
|
* This function commits a with drm_atomic_helper_check() pre-validated state
|
|
* 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
|
|
* 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,
|
|
static int vc4_atomic_commit(struct drm_device *dev,
|
|
struct drm_atomic_state *state,
|
|
struct drm_atomic_state *state,
|
|
- bool async)
|
|
|
|
|
|
+ bool nonblock)
|
|
{
|
|
{
|
|
struct vc4_dev *vc4 = to_vc4_dev(dev);
|
|
struct vc4_dev *vc4 = to_vc4_dev(dev);
|
|
int ret;
|
|
int ret;
|
|
@@ -170,7 +170,7 @@ static int vc4_atomic_commit(struct drm_device *dev,
|
|
* current layout.
|
|
* current layout.
|
|
*/
|
|
*/
|
|
|
|
|
|
- if (async) {
|
|
|
|
|
|
+ if (nonblock) {
|
|
vc4_queue_seqno_cb(dev, &c->cb, wait_seqno,
|
|
vc4_queue_seqno_cb(dev, &c->cb, wait_seqno,
|
|
vc4_atomic_complete_commit_seqno_cb);
|
|
vc4_atomic_complete_commit_seqno_cb);
|
|
} else {
|
|
} else {
|