From: Maarten Lankhorst <maarten.lankhorst@canonical.com>
To: gregkh@linuxfoundation.org
Cc: linux-arch@vger.kernel.org, thellstrom@vmware.com,
linux-kernel@vger.kernel.org, dri-devel@lists.freedesktop.org,
linaro-mm-sig@lists.linaro.org, ccross@google.com,
linux-media@vger.kernel.org
Subject: [PATCH v2 6/9] reservation: add support for fences to enable cross-device synchronisation
Date: Tue, 01 Jul 2014 12:57:37 +0200 [thread overview]
Message-ID: <20140701105737.12718.54300.stgit@patser> (raw)
In-Reply-To: <20140701103432.12718.82795.stgit@patser>
Signed-off-by: Maarten Lankhorst <maarten.lankhorst@canonical.com>
Reviewed-by: Rob Clark <robdclark@gmail.com>
---
include/linux/reservation.h | 20 +++++++++++++++++++-
1 file changed, 19 insertions(+), 1 deletion(-)
diff --git a/include/linux/reservation.h b/include/linux/reservation.h
index 813dae960ebd..f3f57460a205 100644
--- a/include/linux/reservation.h
+++ b/include/linux/reservation.h
@@ -6,7 +6,7 @@
* Copyright (C) 2012 Texas Instruments
*
* Authors:
- * Rob Clark <rob.clark@linaro.org>
+ * Rob Clark <robdclark@gmail.com>
* Maarten Lankhorst <maarten.lankhorst@canonical.com>
* Thomas Hellstrom <thellstrom-at-vmware-dot-com>
*
@@ -40,22 +40,40 @@
#define _LINUX_RESERVATION_H
#include <linux/ww_mutex.h>
+#include <linux/fence.h>
+#include <linux/slab.h>
extern struct ww_class reservation_ww_class;
struct reservation_object {
struct ww_mutex lock;
+
+ struct fence *fence_excl;
+ struct fence **fence_shared;
+ u32 fence_shared_count, fence_shared_max;
};
static inline void
reservation_object_init(struct reservation_object *obj)
{
ww_mutex_init(&obj->lock, &reservation_ww_class);
+
+ obj->fence_shared_count = obj->fence_shared_max = 0;
+ obj->fence_shared = NULL;
+ obj->fence_excl = NULL;
}
static inline void
reservation_object_fini(struct reservation_object *obj)
{
+ int i;
+
+ if (obj->fence_excl)
+ fence_put(obj->fence_excl);
+ for (i = 0; i < obj->fence_shared_count; ++i)
+ fence_put(obj->fence_shared[i]);
+ kfree(obj->fence_shared);
+
ww_mutex_destroy(&obj->lock);
}
WARNING: multiple messages have this Message-ID (diff)
From: Maarten Lankhorst <maarten.lankhorst@canonical.com>
To: gregkh@linuxfoundation.org
Cc: linux-arch@vger.kernel.org, thellstrom@vmware.com,
linux-kernel@vger.kernel.org, dri-devel@lists.freedesktop.org,
linaro-mm-sig@lists.linaro.org, robdclark@gmail.com,
thierry.reding@gmail.com, ccross@google.com, daniel@ffwll.ch,
sumit.semwal@linaro.org, linux-media@vger.kernel.org
Subject: [PATCH v2 6/9] reservation: add support for fences to enable cross-device synchronisation
Date: Tue, 01 Jul 2014 12:57:37 +0200 [thread overview]
Message-ID: <20140701105737.12718.54300.stgit@patser> (raw)
Message-ID: <20140701105737.w6tdGJHumfkp7nnfdKQ40YslOPWVD3Qmb1fbgdLCOBs@z> (raw)
In-Reply-To: <20140701103432.12718.82795.stgit@patser>
Signed-off-by: Maarten Lankhorst <maarten.lankhorst@canonical.com>
Reviewed-by: Rob Clark <robdclark@gmail.com>
---
include/linux/reservation.h | 20 +++++++++++++++++++-
1 file changed, 19 insertions(+), 1 deletion(-)
diff --git a/include/linux/reservation.h b/include/linux/reservation.h
index 813dae960ebd..f3f57460a205 100644
--- a/include/linux/reservation.h
+++ b/include/linux/reservation.h
@@ -6,7 +6,7 @@
* Copyright (C) 2012 Texas Instruments
*
* Authors:
- * Rob Clark <rob.clark@linaro.org>
+ * Rob Clark <robdclark@gmail.com>
* Maarten Lankhorst <maarten.lankhorst@canonical.com>
* Thomas Hellstrom <thellstrom-at-vmware-dot-com>
*
@@ -40,22 +40,40 @@
#define _LINUX_RESERVATION_H
#include <linux/ww_mutex.h>
+#include <linux/fence.h>
+#include <linux/slab.h>
extern struct ww_class reservation_ww_class;
struct reservation_object {
struct ww_mutex lock;
+
+ struct fence *fence_excl;
+ struct fence **fence_shared;
+ u32 fence_shared_count, fence_shared_max;
};
static inline void
reservation_object_init(struct reservation_object *obj)
{
ww_mutex_init(&obj->lock, &reservation_ww_class);
+
+ obj->fence_shared_count = obj->fence_shared_max = 0;
+ obj->fence_shared = NULL;
+ obj->fence_excl = NULL;
}
static inline void
reservation_object_fini(struct reservation_object *obj)
{
+ int i;
+
+ if (obj->fence_excl)
+ fence_put(obj->fence_excl);
+ for (i = 0; i < obj->fence_shared_count; ++i)
+ fence_put(obj->fence_shared[i]);
+ kfree(obj->fence_shared);
+
ww_mutex_destroy(&obj->lock);
}
next prev parent reply other threads:[~2014-07-01 10:57 UTC|newest]
Thread overview: 42+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-07-01 10:57 [PATCH v2 0/9] Updated fence patch series Maarten Lankhorst
2014-07-01 10:57 ` Maarten Lankhorst
2014-07-01 10:57 ` [PATCH v2 1/9] dma-buf: move to drivers/dma-buf Maarten Lankhorst
2014-07-01 10:57 ` Maarten Lankhorst
2014-07-01 11:06 ` Arend van Spriel
2014-07-01 11:09 ` Maarten Lankhorst
2014-07-01 11:09 ` Maarten Lankhorst
2014-07-01 10:57 ` [PATCH v2 2/9] fence: dma-buf cross-device synchronization (v18) Maarten Lankhorst
2014-07-01 10:57 ` Maarten Lankhorst
2014-07-01 10:57 ` [PATCH v2 3/9] seqno-fence: Hardware dma-buf implementation of fencing (v6) Maarten Lankhorst
2014-07-01 10:57 ` Maarten Lankhorst
2014-07-01 10:57 ` [PATCH v2 4/9] dma-buf: use reservation objects Maarten Lankhorst
2014-07-01 10:57 ` Maarten Lankhorst
2014-07-01 10:57 ` [PATCH v2 5/9] android: convert sync to fence api, v6 Maarten Lankhorst
2014-07-01 10:57 ` Maarten Lankhorst
2014-07-01 10:57 ` Maarten Lankhorst [this message]
2014-07-01 10:57 ` [PATCH v2 6/9] reservation: add support for fences to enable cross-device synchronisation Maarten Lankhorst
2014-07-01 10:57 ` [PATCH v2 7/9] dma-buf: add poll support, v3 Maarten Lankhorst
2014-07-01 10:57 ` Maarten Lankhorst
2014-07-01 10:57 ` [PATCH v2 8/9] reservation: update api and add some helpers Maarten Lankhorst
2014-07-01 10:57 ` Maarten Lankhorst
2014-07-01 10:58 ` [PATCH v2 9/9] reservation: add suppport for read-only access using rcu Maarten Lankhorst
2014-07-01 10:58 ` Maarten Lankhorst
2014-07-02 5:37 ` [PATCH v2 0/9] Updated fence patch series Greg KH
2014-07-02 5:37 ` Greg KH
2014-07-02 9:12 ` Maarten Lankhorst
2014-07-02 9:12 ` Maarten Lankhorst
2014-07-08 20:46 ` Greg KH
2014-07-08 20:46 ` Greg KH
2014-07-07 13:23 ` Daniel Vetter
2014-07-07 13:23 ` Daniel Vetter
2014-07-07 17:30 ` Greg KH
2014-07-07 17:30 ` Greg KH
2014-07-08 13:44 ` Daniel Vetter
2014-07-08 13:44 ` Daniel Vetter
2014-07-08 14:39 ` Greg KH
2014-07-08 14:39 ` Greg KH
2014-07-08 14:52 ` Sumit Semwal
2014-07-08 17:52 ` Greg KH
2014-07-08 17:52 ` Greg KH
2014-07-07 17:27 ` Sumit Semwal
2014-07-07 17:27 ` Sumit Semwal
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=20140701105737.12718.54300.stgit@patser \
--to=maarten.lankhorst@canonical.com \
--cc=ccross@google.com \
--cc=dri-devel@lists.freedesktop.org \
--cc=gregkh@linuxfoundation.org \
--cc=linaro-mm-sig@lists.linaro.org \
--cc=linux-arch@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-media@vger.kernel.org \
--cc=thellstrom@vmware.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