From: Rob Clark <robdclark@gmail.com>
To: dri-devel@lists.freedesktop.org
Cc: Daniel Vetter <daniel@ffwll.ch>,
maarten.lankhorst@canonical.com, linux-arm-msm@vger.kernel.org,
freedreno@lists.freedesktop.org, Rob Clark <robdclark@gmail.com>
Subject: [PATCH 02/11] drm/atomic: export drm_atomic_helper_wait_for_fences()
Date: Fri, 18 Mar 2016 19:14:55 -0400 [thread overview]
Message-ID: <1458342904-23326-3-git-send-email-robdclark@gmail.com> (raw)
In-Reply-To: <1458342904-23326-1-git-send-email-robdclark@gmail.com>
Signed-off-by: Rob Clark <robdclark@gmail.com>
---
drivers/gpu/drm/drm_atomic_helper.c | 15 +++++++++++++--
include/drm/drm_atomic_helper.h | 2 ++
2 files changed, 15 insertions(+), 2 deletions(-)
diff --git a/drivers/gpu/drm/drm_atomic_helper.c b/drivers/gpu/drm/drm_atomic_helper.c
index 7c52306..aa72732 100644
--- a/drivers/gpu/drm/drm_atomic_helper.c
+++ b/drivers/gpu/drm/drm_atomic_helper.c
@@ -927,7 +927,17 @@ void drm_atomic_helper_commit_modeset_enables(struct drm_device *dev,
}
EXPORT_SYMBOL(drm_atomic_helper_commit_modeset_enables);
-static void wait_for_fences(struct drm_device *dev,
+/**
+ * drm_atomic_helper_wait_for_fences - wait for fences stashed in plane state
+ * @dev: DRM device
+ * @state: atomic state object with old state structures
+ *
+ * For implicit sync, driver should fish the exclusive fence out from the
+ * incoming fb's and stash it in the drm_plane_state. This is called after
+ * drm_atomic_helper_swap_state() so it uses the current plane state (and
+ * just uses the atomic state to find the changed planes)
+ */
+void drm_atomic_helper_wait_for_fences(struct drm_device *dev,
struct drm_atomic_state *state)
{
struct drm_plane *plane;
@@ -945,6 +955,7 @@ static void wait_for_fences(struct drm_device *dev,
plane->state->fence = NULL;
}
}
+EXPORT_SYMBOL(drm_atomic_helper_wait_for_fences);
/**
* drm_atomic_helper_framebuffer_changed - check if framebuffer has changed
@@ -1106,7 +1117,7 @@ int drm_atomic_helper_commit(struct drm_device *dev,
* current layout.
*/
- wait_for_fences(dev, state);
+ drm_atomic_helper_wait_for_fences(dev, state);
drm_atomic_helper_commit_modeset_disables(dev, state);
diff --git a/include/drm/drm_atomic_helper.h b/include/drm/drm_atomic_helper.h
index fe5efad..2b20b28 100644
--- a/include/drm/drm_atomic_helper.h
+++ b/include/drm/drm_atomic_helper.h
@@ -42,6 +42,8 @@ int drm_atomic_helper_commit(struct drm_device *dev,
struct drm_atomic_state *state,
bool async);
+void drm_atomic_helper_wait_for_fences(struct drm_device *dev,
+ struct drm_atomic_state *state);
bool drm_atomic_helper_framebuffer_changed(struct drm_device *dev,
struct drm_atomic_state *old_state,
struct drm_crtc *crtc);
--
2.5.0
next prev parent reply other threads:[~2016-03-18 23:15 UTC|newest]
Thread overview: 14+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-03-18 23:14 [PATCH 00/11] drm/msm: fencification Rob Clark
2016-03-18 23:14 ` [PATCH 01/11] reservation: add reservation_object_get_excl_unlocked() Rob Clark
2016-03-18 23:14 ` Rob Clark [this message]
2016-03-30 20:51 ` [PATCH 02/11] drm/atomic: export drm_atomic_helper_wait_for_fences() Gustavo Padovan
2016-03-31 5:57 ` Daniel Vetter
2016-03-18 23:14 ` [PATCH 03/11] drm/msm: move debugfs code to it's own file Rob Clark
2016-03-18 23:14 ` [PATCH 04/11] drm/msm: move fence " Rob Clark
2016-03-18 23:14 ` [PATCH 05/11] drm/msm: use imported dmabuf's reservation object Rob Clark
2016-03-18 23:14 ` [PATCH 06/11] drm/msm: split out timeout_to_jiffies helper Rob Clark
2016-03-18 23:15 ` [PATCH 07/11] drm/msm/gpu: simplify tracking in-flight bo's Rob Clark
2016-03-18 23:15 ` [PATCH 08/11] drm/msm: split locking and pinning BO's Rob Clark
2016-03-18 23:15 ` [PATCH 09/11] drm/msm: introduce msm_fence_context Rob Clark
2016-03-18 23:15 ` [PATCH 10/11] drm/msm: remove fence_cbs Rob Clark
2016-03-18 23:15 ` [PATCH 11/11] drm/msm: 'struct fence' conversion Rob Clark
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=1458342904-23326-3-git-send-email-robdclark@gmail.com \
--to=robdclark@gmail.com \
--cc=daniel@ffwll.ch \
--cc=dri-devel@lists.freedesktop.org \
--cc=freedreno@lists.freedesktop.org \
--cc=linux-arm-msm@vger.kernel.org \
--cc=maarten.lankhorst@canonical.com \
/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;
as well as URLs for NNTP newsgroup(s).