|
@@ -276,7 +276,7 @@ void rockchip_drm_atomic_work(struct work_struct *work)
|
|
|
|
|
|
int rockchip_drm_atomic_commit(struct drm_device *dev,
|
|
|
struct drm_atomic_state *state,
|
|
|
- bool async)
|
|
|
+ bool nonblock)
|
|
|
{
|
|
|
struct rockchip_drm_private *private = dev->dev_private;
|
|
|
struct rockchip_atomic_commit *commit = &private->commit;
|
|
@@ -286,7 +286,7 @@ int rockchip_drm_atomic_commit(struct drm_device *dev,
|
|
|
if (ret)
|
|
|
return ret;
|
|
|
|
|
|
- /* serialize outstanding asynchronous commits */
|
|
|
+ /* serialize outstanding nonblocking commits */
|
|
|
mutex_lock(&commit->lock);
|
|
|
flush_work(&commit->work);
|
|
|
|
|
@@ -295,7 +295,7 @@ int rockchip_drm_atomic_commit(struct drm_device *dev,
|
|
|
commit->dev = dev;
|
|
|
commit->state = state;
|
|
|
|
|
|
- if (async)
|
|
|
+ if (nonblock)
|
|
|
schedule_work(&commit->work);
|
|
|
else
|
|
|
rockchip_atomic_commit_complete(commit);
|