From: Maarten Lankhorst <maarten.lankhorst@linux.intel.com>
To: dri-devel@lists.freedesktop.org
Cc: intel-gfx@lists.freedesktop.org
Subject: [PATCH 05/12] drm/msm: Rename async to nonblock.
Date: Tue, 26 Apr 2016 16:11:38 +0200 [thread overview]
Message-ID: <1461679905-30177-6-git-send-email-maarten.lankhorst@linux.intel.com> (raw)
In-Reply-To: <1461679905-30177-1-git-send-email-maarten.lankhorst@linux.intel.com>
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: Maarten Lankhorst <maarten.lankhorst@linux.intel.com>
---
drivers/gpu/drm/msm/msm_atomic.c | 9 ++++-----
drivers/gpu/drm/msm/msm_drv.h | 2 +-
2 files changed, 5 insertions(+), 6 deletions(-)
diff --git a/drivers/gpu/drm/msm/msm_atomic.c b/drivers/gpu/drm/msm/msm_atomic.c
index 7eb253bc24df..5c6130969f4d 100644
--- a/drivers/gpu/drm/msm/msm_atomic.c
+++ b/drivers/gpu/drm/msm/msm_atomic.c
@@ -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;
}
diff --git a/drivers/gpu/drm/msm/msm_drv.h b/drivers/gpu/drm/msm/msm_drv.h
index 870dbe58c259..0b8b0e630e42 100644
--- a/drivers/gpu/drm/msm/msm_drv.h
+++ b/drivers/gpu/drm/msm/msm_drv.h
@@ -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);
--
2.5.5
_______________________________________________
dri-devel mailing list
dri-devel@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/dri-devel
next prev parent reply other threads:[~2016-04-26 14:11 UTC|newest]
Thread overview: 18+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-04-26 14:11 [PATCH 00/12] drm/atomic: Rename async to nonblocking Maarten Lankhorst
2016-04-26 14:11 ` [PATCH 01/12] drm/atomic: Rename async parameter " Maarten Lankhorst
2016-04-26 14:11 ` [PATCH 02/12] drm/atomic: Rename drm_atomic_async_commit " Maarten Lankhorst
2016-04-26 14:11 ` [PATCH 03/12] drm/arm/hdlcd: Rename async to nonblock Maarten Lankhorst
2016-04-26 15:03 ` Liviu Dudau
2016-04-26 14:11 ` [PATCH 04/12] drm/exynos: " Maarten Lankhorst
2016-04-26 14:11 ` Maarten Lankhorst [this message]
2016-04-26 14:11 ` [PATCH 06/12] drm/omapdrm: " Maarten Lankhorst
2016-04-26 14:11 ` [PATCH 07/12] drm/rcar-du: " Maarten Lankhorst
2016-04-27 15:31 ` Laurent Pinchart
2016-04-26 14:11 ` [PATCH 08/12] drm/sti: " Maarten Lankhorst
2016-04-27 7:17 ` Vincent ABRIOU
2016-04-26 14:11 ` [PATCH 09/12] drm/tegra: " Maarten Lankhorst
2016-04-26 14:11 ` [PATCH 10/12] drm/rockchip: " Maarten Lankhorst
2016-04-26 14:11 ` [PATCH 11/12] drm/vc4: " Maarten Lankhorst
2016-04-26 14:11 ` [PATCH 12/12] drm/i915: " Maarten Lankhorst
2016-04-26 14:34 ` [PATCH 00/12] drm/atomic: Rename async to nonblocking Daniel Vetter
2016-05-02 14:39 ` Daniel Vetter
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1461679905-30177-6-git-send-email-maarten.lankhorst@linux.intel.com \
--to=maarten.lankhorst@linux.intel.com \
--cc=dri-devel@lists.freedesktop.org \
--cc=intel-gfx@lists.freedesktop.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox