From: Maarten Lankhorst <maarten.lankhorst@canonical.com> To: linux-kernel@vger.kernel.org Cc: linux-arch@vger.kernel.org, dri-devel@lists.freedesktop.org, linaro-mm-sig@lists.linaro.org, ccross@google.com, linux-media@vger.kernel.org Subject: [PATCH 5/6] reservation: add support for fences to enable cross-device synchronisation Date: Mon, 24 Feb 2014 17:30:04 +0100 [thread overview] Message-ID: <20140224163001.20485.26677.stgit@patser> (raw) In-Reply-To: <20140224162607.20485.70967.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: linux-kernel@vger.kernel.org Cc: linux-arch@vger.kernel.org, ccross@google.com, linaro-mm-sig@lists.linaro.org, robdclark@gmail.com, dri-devel@lists.freedesktop.org, daniel@ffwll.ch, sumit.semwal@linaro.org, linux-media@vger.kernel.org Subject: [PATCH 5/6] reservation: add support for fences to enable cross-device synchronisation Date: Mon, 24 Feb 2014 17:30:04 +0100 [thread overview] Message-ID: <20140224163001.20485.26677.stgit@patser> (raw) Message-ID: <20140224163004.h3wN9t-S8KOIFpauJNRXUzGOcuQEsKO-IGoRcwtsrTg@z> (raw) In-Reply-To: <20140224162607.20485.70967.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-02-24 16:30 UTC|newest] Thread overview: 19+ messages / expand[flat|nested] mbox.gz Atom feed top 2014-02-24 16:28 [PATCH 0/6] dma-buf synchronization patches (updated) Maarten Lankhorst 2014-02-24 16:28 ` Maarten Lankhorst 2014-02-24 16:28 ` [PATCH 1/6] fence: dma-buf cross-device synchronization (v17) Maarten Lankhorst 2014-02-24 16:28 ` Maarten Lankhorst 2014-02-24 16:29 ` [PATCH 2/6] seqno-fence: Hardware dma-buf implementation of fencing (v5) Maarten Lankhorst 2014-02-24 16:29 ` Maarten Lankhorst 2014-02-24 16:29 ` [PATCH 3/6] dma-buf: use reservation objects Maarten Lankhorst 2014-02-24 16:29 ` Maarten Lankhorst 2014-02-24 16:29 ` [PATCH 4/6] android: convert sync to fence api, v5 Maarten Lankhorst 2014-02-24 16:29 ` Maarten Lankhorst 2014-05-19 18:49 ` John Stultz 2014-05-19 18:49 ` John Stultz 2014-02-24 16:30 ` Maarten Lankhorst [this message] 2014-02-24 16:30 ` [PATCH 5/6] reservation: add support for fences to enable cross-device synchronisation Maarten Lankhorst 2014-02-24 16:30 ` [PATCH 6/6] dma-buf: add poll support, v3 Maarten Lankhorst 2014-02-24 16:30 ` Maarten Lankhorst -- strict thread matches above, loose matches on Subject: below -- 2014-02-17 15:55 [PATCH 0/6] dma-buf synchronization patches Maarten Lankhorst 2014-02-17 15:58 ` [PATCH 5/6] reservation: add support for fences to enable cross-device synchronisation Maarten Lankhorst 2014-02-17 16:54 ` Rob Clark 2014-02-17 16:54 ` 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=20140224163001.20485.26677.stgit@patser \ --to=maarten.lankhorst@canonical.com \ --cc=ccross@google.com \ --cc=dri-devel@lists.freedesktop.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 \ /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: linkBe 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).