Commit a3ccfb9f authored by Maarten Lankhorst's avatar Maarten Lankhorst Committed by Daniel Vetter

drm/msm: Rename async to nonblock.

The async name is deprecated and should be changed to nonblocking.

Also comments seem to be a bit outdated, as it looks like
nonblocking commit is supported by msm.

Cc: Rob Clark <robdclark@gmail.com>
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-6-git-send-email-maarten.lankhorst@linux.intel.com
parent 1b3f09d8
...@@ -190,17 +190,16 @@ int msm_atomic_check(struct drm_device *dev, ...@@ -190,17 +190,16 @@ int msm_atomic_check(struct drm_device *dev,
* drm_atomic_helper_commit - commit validated state object * drm_atomic_helper_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.
* now this doesn't implement asynchronous commits.
* *
* RETURNS * RETURNS
* Zero for success or -errno. * Zero for success or -errno.
*/ */
int msm_atomic_commit(struct drm_device *dev, int msm_atomic_commit(struct drm_device *dev,
struct drm_atomic_state *state, bool async) struct drm_atomic_state *state, bool nonblock)
{ {
int nplanes = dev->mode_config.num_total_plane; int nplanes = dev->mode_config.num_total_plane;
int ncrtcs = dev->mode_config.num_crtc; int ncrtcs = dev->mode_config.num_crtc;
...@@ -276,7 +275,7 @@ int msm_atomic_commit(struct drm_device *dev, ...@@ -276,7 +275,7 @@ int msm_atomic_commit(struct drm_device *dev,
* current layout. * current layout.
*/ */
if (async) { if (nonblock) {
msm_queue_fence_cb(dev, &c->fence_cb, c->fence); msm_queue_fence_cb(dev, &c->fence_cb, c->fence);
return 0; return 0;
} }
......
...@@ -174,7 +174,7 @@ void __msm_fence_worker(struct work_struct *work); ...@@ -174,7 +174,7 @@ void __msm_fence_worker(struct work_struct *work);
int msm_atomic_check(struct drm_device *dev, int msm_atomic_check(struct drm_device *dev,
struct drm_atomic_state *state); struct drm_atomic_state *state);
int msm_atomic_commit(struct drm_device *dev, int msm_atomic_commit(struct drm_device *dev,
struct drm_atomic_state *state, bool async); struct drm_atomic_state *state, bool nonblock);
int msm_register_mmu(struct drm_device *dev, struct msm_mmu *mmu); int msm_register_mmu(struct drm_device *dev, struct msm_mmu *mmu);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment