Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

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

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

drivers/gpu/drm/msm/msm_atomic.c

+4 −5
Original line number Diff line number Diff line
@@ -190,17 +190,16 @@ int msm_atomic_check(struct drm_device *dev, 
 * drm_atomic_helper_commit - commit validated state object

 * @dev: DRM device

 * @state: the driver state object

 * @async: asynchronous commit

 * @nonblock: nonblocking commit

 *

 * 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

 * now this doesn't implement asynchronous commits.

 * object. This can still fail when e.g. the framebuffer reservation fails.

 *

 * RETURNS

 * Zero for success or -errno.

 */

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 ncrtcs = dev->mode_config.num_crtc;
@@ -276,7 +275,7 @@ int msm_atomic_commit(struct drm_device *dev, 
	 * current layout.

	 */



	if (async) {

	if (nonblock) {

		msm_queue_fence_cb(dev, &c->fence_cb, c->fence);

		return 0;

	}

drivers/gpu/drm/msm/msm_drv.h

+1 −1
Original line number Diff line number Diff line
@@ -174,7 +174,7 @@ void __msm_fence_worker(struct work_struct *work); 
int msm_atomic_check(struct drm_device *dev,

		     struct drm_atomic_state *state);

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);