dri-devel.lists.freedesktop.org archive mirror
 help / color / mirror / Atom feed
From: Dave Airlie <airlied-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org>
To: dri-devel-PD4FTy7X32lNgt0PjOBp9y5qC8QIuHrW@public.gmane.org,
	amd-gfx-PD4FTy7X32lNgt0PjOBp9y5qC8QIuHrW@public.gmane.org
Subject: [PATCH 3/5] drm/syncobj: add sync_file interaction.
Date: Fri, 12 May 2017 10:34:55 +1000	[thread overview]
Message-ID: <20170512003457.24936-4-airlied@gmail.com> (raw)
In-Reply-To: <20170512003457.24936-1-airlied-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org>

From: Dave Airlie <airlied@redhat.com>

This interface allows importing the fence from a sync_file into
an existing drm sync object, or exporting the fence attached to
an existing drm sync object into a new sync file object.

This should only be used to interact with sync files where necessary.

Signed-off-by: Dave Airlie <airlied@redhat.com>
---
 drivers/gpu/drm/drm_syncobj.c | 56 +++++++++++++++++++++++++++++++++++++++++++
 include/uapi/drm/drm.h        |  6 +++--
 2 files changed, 60 insertions(+), 2 deletions(-)

diff --git a/drivers/gpu/drm/drm_syncobj.c b/drivers/gpu/drm/drm_syncobj.c
index 9a8c690..69ef20a 100644
--- a/drivers/gpu/drm/drm_syncobj.c
+++ b/drivers/gpu/drm/drm_syncobj.c
@@ -52,6 +52,7 @@
 #include <linux/file.h>
 #include <linux/fs.h>
 #include <linux/anon_inodes.h>
+#include <linux/sync_file.h>
 
 #include "drm_internal.h"
 #include <drm/drm_syncobj.h>
@@ -290,6 +291,48 @@ static int drm_syncobj_fd_to_handle(struct drm_file *file_private,
 	return 0;
 }
 
+int drm_syncobj_import_sync_file_fence(struct drm_file *file_private,
+				       int fd, int handle)
+{
+	struct dma_fence *fence = sync_file_get_fence(fd);
+	if (!fence)
+		return -EINVAL;
+
+	return drm_syncobj_replace_fence(file_private, handle, fence);
+}
+
+int drm_syncobj_export_sync_file(struct drm_file *file_private,
+				 int handle, int *p_fd)
+{
+	int ret;
+	struct dma_fence *fence;
+	struct sync_file *sync_file;
+	int fd = get_unused_fd_flags(O_CLOEXEC);
+
+	if (fd < 0)
+		return fd;
+
+	ret = drm_syncobj_fence_get(file_private, handle, &fence);
+	if (ret)
+		goto err_put_fd;
+
+	sync_file = sync_file_create(fence);
+	if (!sync_file) {
+		ret = -EINVAL;
+		goto err_fence_put;
+	}
+
+	fd_install(fd, sync_file->file);
+
+	dma_fence_put(fence);
+	*p_fd = fd;
+	return 0;
+err_fence_put:
+	dma_fence_put(fence);
+err_put_fd:
+	put_unused_fd(fd);
+	return ret;
+}
 /**
  * drm_syncobj_open - initalizes syncobj file-private structures at devnode open time
  * @dev: drm_device which is being opened by userspace
@@ -372,6 +415,12 @@ drm_syncobj_handle_to_fd_ioctl(struct drm_device *dev, void *data,
 	if (!drm_core_check_feature(dev, DRIVER_SYNCOBJ))
 		return -ENODEV;
 
+	if (args->flags & DRM_SYNCOBJ_HANDLE_TO_FD_FLAGS_EXPORT_FENCE_SYNC_FILE)
+		return drm_syncobj_export_sync_file(file_private, args->handle,
+						    &args->fd);
+	else if (args->flags)
+		return -EINVAL;
+
 	return drm_syncobj_handle_to_fd(file_private, args->handle,
 					&args->fd);
 }
@@ -385,6 +434,13 @@ drm_syncobj_fd_to_handle_ioctl(struct drm_device *dev, void *data,
 	if (!drm_core_check_feature(dev, DRIVER_SYNCOBJ))
 		return -ENODEV;
 
+	if (args->flags & DRM_SYNCOBJ_FD_TO_HANDLE_FLAGS_IMPORT_SYNC_FILE_FENCE)
+		return drm_syncobj_import_sync_file_fence(file_private,
+							  args->fd,
+							  args->handle);
+	else if (args->flags)
+		return -EINVAL;
+
 	return drm_syncobj_fd_to_handle(file_private, args->fd,
 					&args->handle);
 }
diff --git a/include/uapi/drm/drm.h b/include/uapi/drm/drm.h
index db9e35e..d0e05f4 100644
--- a/include/uapi/drm/drm.h
+++ b/include/uapi/drm/drm.h
@@ -707,13 +707,15 @@ struct drm_syncobj_destroy {
 	__u32 pad;
 };
 
+#define DRM_SYNCOBJ_FD_TO_HANDLE_FLAGS_IMPORT_SYNC_FILE_FENCE (1 << 0)
+#define DRM_SYNCOBJ_HANDLE_TO_FD_FLAGS_EXPORT_FENCE_SYNC_FILE (1 << 0)
 struct drm_syncobj_handle {
 	__u32 handle;
 	/** Flags.. only applicable for handle->fd */
-	__u32 flags;
+	__u32 fd_flags;
 
 	__s32 fd;
-	__u32 pad;
+	__u32 flags;
 };
 
 /* timeout_ns is relative timeout in nanoseconds */
-- 
2.9.3

_______________________________________________
amd-gfx mailing list
amd-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/amd-gfx

  parent reply	other threads:[~2017-05-12  0:34 UTC|newest]

Thread overview: 26+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2017-05-12  0:34 drm syncobj - can we get some r-b/a-bs? Dave Airlie
     [not found] ` <20170512003457.24936-1-airlied-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org>
2017-05-12  0:34   ` [PATCH 1/5] drm: introduce sync objects (v2) Dave Airlie
     [not found]     ` <20170512003457.24936-2-airlied-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org>
2017-05-12  8:12       ` Daniel Vetter
2017-05-12 13:33       ` Sean Paul
2017-05-12  0:34   ` [PATCH 2/5] drm/syncobj: add sync obj wait interface. (v2) Dave Airlie
2017-05-12  8:13     ` Daniel Vetter
     [not found]     ` <20170512003457.24936-3-airlied-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org>
2017-05-12  8:49       ` Chris Wilson
     [not found]         ` <20170512084951.GD12185-aII6DKEyn0pWYbfKqPwjAkR8Iwp7RQ6xAL8bYrjMMd8@public.gmane.org>
2017-05-12  8:57           ` Christian König
2017-05-12 13:35       ` Sean Paul
2017-05-12  0:34   ` Dave Airlie [this message]
     [not found]     ` <20170512003457.24936-4-airlied-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org>
2017-05-12  8:01       ` [PATCH 3/5] drm/syncobj: add sync_file interaction Daniel Vetter
2017-05-12 13:38       ` Sean Paul
2017-08-03 16:25       ` Chris Wilson
2017-08-03 23:01         ` Dave Airlie
     [not found]           ` <CAPM=9tw8kFhHWp1tVhmBRqBqX4WnaSvQtLd0OD_U=CNpDROsBQ-JsoAwUIsXosN+BqQ9rBEUg@public.gmane.org>
2017-08-03 23:22             ` Chris Wilson
     [not found]               ` <150180256673.14563.14290309660718108784-M6iVdVfohj6unts5RBS2dVaTQe2KTcn/@public.gmane.org>
2017-08-04  1:03                 ` Dave Airlie
2017-05-12  0:34   ` [PATCH 4/5] amdgpu/cs: split out fence dependency checking Dave Airlie
2017-05-12  0:34   ` [PATCH 5/5] amdgpu: use drm sync objects for shared semaphores (v4) Dave Airlie
     [not found]     ` <20170512003457.24936-6-airlied-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org>
2017-05-12  3:34       ` zhoucm1
     [not found]         ` <59152D36.8000608-5C7GfCeVMHo@public.gmane.org>
2017-05-12  4:17           ` Dave Airlie
     [not found]             ` <CAPM=9tz5A9toCZAk10nOWub-qfiV6+aPBy9FDZANvAywfp8Vhw-JsoAwUIsXosN+BqQ9rBEUg@public.gmane.org>
2017-05-12  5:45               ` zhoucm1
2017-05-12  8:39     ` Christian König
  -- strict thread matches above, loose matches on Subject: below --
2017-05-24  7:06 drm syncobj - final posting I hope Dave Airlie
     [not found] ` <20170524070615.1634-1-airlied-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org>
2017-05-24  7:06   ` [PATCH 3/5] drm/syncobj: add sync_file interaction Dave Airlie
     [not found]     ` <20170524070615.1634-4-airlied-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org>
2017-05-24 17:34       ` Jason Ekstrand
2017-05-25  8:54     ` Chris Wilson
2017-04-26  3:28 [rfc] drm sync objects (search for spock) Dave Airlie
     [not found] ` <20170426032833.1455-1-airlied-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org>
2017-04-26  3:28   ` [PATCH 3/5] drm/syncobj: add sync_file interaction Dave Airlie

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=20170512003457.24936-4-airlied@gmail.com \
    --to=airlied-re5jqeeqqe8avxtiumwx3w@public.gmane.org \
    --cc=amd-gfx-PD4FTy7X32lNgt0PjOBp9y5qC8QIuHrW@public.gmane.org \
    --cc=dri-devel-PD4FTy7X32lNgt0PjOBp9y5qC8QIuHrW@public.gmane.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;
as well as URLs for NNTP newsgroup(s).