From: Gustavo Padovan <gustavo@padovan.org>
To: dri-devel@lists.freedesktop.org
Cc: linux-kernel@vger.kernel.org,
"Daniel Stone" <daniels@collabora.com>,
"Arve Hjønnevåg" <arve@android.com>,
"Riley Andrews" <riandrews@android.com>,
"Daniel Vetter" <daniel.vetter@ffwll.ch>,
"Rob Clark" <robdclark@gmail.com>,
"Greg Hackmann" <ghackmann@google.com>,
"John Harrison" <John.C.Harrison@Intel.com>,
"Maarten Lankhorst" <maarten.lankhorst@linux.intel.com>,
"Gustavo Padovan" <gustavo.padovan@collabora.co.uk>
Subject: [RFC 6/6] drm/fence: support fence_collection on atomic commit
Date: Wed, 23 Mar 2016 15:47:27 -0300 [thread overview]
Message-ID: <1458758847-21170-7-git-send-email-gustavo@padovan.org> (raw)
In-Reply-To: <1458758847-21170-1-git-send-email-gustavo@padovan.org>
From: Gustavo Padovan <gustavo.padovan@collabora.co.uk>
Let atomic_commit() wait on a collection of fences before proceed with
the scanout.
Signed-off-by: Gustavo Padovan <gustavo.padovan@collabora.co.uk>
---
drivers/gpu/drm/drm_atomic.c | 9 +++++++++
drivers/gpu/drm/drm_atomic_helper.c | 9 +++++----
include/drm/drm_crtc.h | 2 +-
3 files changed, 15 insertions(+), 5 deletions(-)
diff --git a/drivers/gpu/drm/drm_atomic.c b/drivers/gpu/drm/drm_atomic.c
index 8bc364c..28a65d1 100644
--- a/drivers/gpu/drm/drm_atomic.c
+++ b/drivers/gpu/drm/drm_atomic.c
@@ -29,6 +29,7 @@
#include <drm/drmP.h>
#include <drm/drm_atomic.h>
#include <drm/drm_plane_helper.h>
+#include <linux/sync_file.h>
/**
* drm_atomic_state_default_release -
@@ -795,6 +796,14 @@ static int drm_atomic_plane_check(struct drm_plane *plane,
return -EINVAL;
}
+#ifdef CONFIG_SYNC_FILE
+ if (state->fence_fd >= 0) {
+ state->fences = sync_file_fences_get(state->fence_fd);
+ if (!state->fences)
+ return -EINVAL;
+ }
+#endif
+
return 0;
}
diff --git a/drivers/gpu/drm/drm_atomic_helper.c b/drivers/gpu/drm/drm_atomic_helper.c
index 4f91f84..a6e34b6 100644
--- a/drivers/gpu/drm/drm_atomic_helper.c
+++ b/drivers/gpu/drm/drm_atomic_helper.c
@@ -977,14 +977,12 @@ static void wait_for_fences(struct drm_device *dev,
int i;
for_each_plane_in_state(state, plane, plane_state, i) {
- if (!plane->state->fence)
+ if (!plane->state->fences)
continue;
WARN_ON(!plane->state->fb);
- fence_wait(plane->state->fence, false);
- fence_put(plane->state->fence);
- plane->state->fence = NULL;
+ fence_collection_wait(plane->state->fences);
}
}
@@ -2654,6 +2652,9 @@ void __drm_atomic_helper_plane_destroy_state(struct drm_plane *plane,
{
if (state->fb)
drm_framebuffer_unreference(state->fb);
+
+ if (state->fences)
+ fence_collection_put(state->fences);
}
EXPORT_SYMBOL(__drm_atomic_helper_plane_destroy_state);
diff --git a/include/drm/drm_crtc.h b/include/drm/drm_crtc.h
index a8f6ec0..c221c28 100644
--- a/include/drm/drm_crtc.h
+++ b/include/drm/drm_crtc.h
@@ -1257,7 +1257,7 @@ struct drm_plane_state {
struct drm_crtc *crtc; /* do not write directly, use drm_atomic_set_crtc_for_plane() */
struct drm_framebuffer *fb; /* do not write directly, use drm_atomic_set_fb_for_plane() */
- struct fence *fence;
+ struct fence_collection *fences;
int fence_fd;
/* Signed dest location allows it to be partially off screen */
--
2.5.0
next prev parent reply other threads:[~2016-03-23 18:47 UTC|newest]
Thread overview: 37+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-03-23 18:47 [RFC 0/6] drm/fences: add in-fences to DRM Gustavo Padovan
2016-03-23 18:47 ` [RFC 1/6] drm/fence: add FENCE_FD property to planes Gustavo Padovan
2016-04-05 12:36 ` Rob Clark
2016-04-05 12:57 ` Daniel Stone
2016-04-05 14:04 ` Rob Clark
2016-04-05 14:19 ` Daniel Stone
2016-04-05 15:23 ` Rob Clark
2016-03-23 18:47 ` [RFC 2/6] dma-buf/fence: add struct fence_collection Gustavo Padovan
2016-03-23 18:47 ` [RFC 3/6] dma-buf/sync_file: add sync_file_fences_get() Gustavo Padovan
2016-03-23 18:47 ` [RFC 4/6] dma-buf/fence: add fence_collection_put() Gustavo Padovan
2016-03-23 18:47 ` [RFC 5/6] dma-buf/fence: add fence_collection_wait() Gustavo Padovan
2016-03-23 18:47 ` Gustavo Padovan [this message]
2016-03-24 7:20 ` [RFC 0/6] drm/fences: add in-fences to DRM Maarten Lankhorst
2016-03-24 14:31 ` Gustavo Padovan
2016-03-24 8:18 ` Inki Dae
2016-03-24 14:39 ` Gustavo Padovan
2016-03-24 23:03 ` Inki Dae
2016-03-24 15:40 ` Rob Clark
2016-03-24 23:49 ` Inki Dae
2016-03-25 11:58 ` Rob Clark
2016-03-25 12:10 ` Daniel Stone
2016-03-28 1:26 ` Inki Dae
2016-03-28 13:26 ` Daniel Stone
2016-03-29 2:18 ` Inki Dae
2016-03-29 13:23 ` Rob Clark
2016-03-31 7:45 ` Inki Dae
2016-03-31 9:35 ` Daniel Stone
2016-03-31 10:04 ` Daniel Vetter
2016-03-31 11:40 ` Inki Dae
2016-03-31 10:05 ` Inki Dae
2016-03-31 10:56 ` Daniel Stone
2016-03-31 11:26 ` Inki Dae
2016-03-31 11:41 ` Daniel Stone
2016-03-31 14:10 ` Rob Clark
2016-04-04 0:14 ` Inki Dae
2016-04-04 15:41 ` Rob Clark
2016-04-04 15:46 ` 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=1458758847-21170-7-git-send-email-gustavo@padovan.org \
--to=gustavo@padovan.org \
--cc=John.C.Harrison@Intel.com \
--cc=arve@android.com \
--cc=daniel.vetter@ffwll.ch \
--cc=daniels@collabora.com \
--cc=dri-devel@lists.freedesktop.org \
--cc=ghackmann@google.com \
--cc=gustavo.padovan@collabora.co.uk \
--cc=linux-kernel@vger.kernel.org \
--cc=maarten.lankhorst@linux.intel.com \
--cc=riandrews@android.com \
--cc=robdclark@gmail.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
all inboxes | Powered by JetHome®