From: "Christian König" <ckoenig.leichtzumerken@gmail.com>
To: dri-devel@lists.freedesktop.org, linaro-mm-sig@lists.linaro.org
Subject: [PATCH 03/11] dma-buf: cleanup dma-resv shared fence debugging a bit
Date: Mon, 17 May 2021 16:11:21 +0200 [thread overview]
Message-ID: <20210517141129.2225-4-christian.koenig@amd.com> (raw)
In-Reply-To: <20210517141129.2225-1-christian.koenig@amd.com>
Make that a function instead of inline.
Signed-off-by: Christian König <christian.koenig@amd.com>
---
drivers/dma-buf/dma-resv.c | 18 ++++++++++++++++++
include/linux/dma-resv.h | 15 +++++++--------
2 files changed, 25 insertions(+), 8 deletions(-)
diff --git a/drivers/dma-buf/dma-resv.c b/drivers/dma-buf/dma-resv.c
index 87f5d82d992a..6c6195315e9f 100644
--- a/drivers/dma-buf/dma-resv.c
+++ b/drivers/dma-buf/dma-resv.c
@@ -208,6 +208,24 @@ int dma_resv_reserve_shared(struct dma_resv *obj, unsigned int num_fences)
}
EXPORT_SYMBOL(dma_resv_reserve_shared);
+#ifdef CONFIG_DEBUG_MUTEXES
+/**
+ * dma_resv_reset_shared_max - reset shared fences for debugging
+ * @obj: the dma_resv object to reset
+ *
+ * Reset the shared_max to test if drivers do correct slot allocation.
+ */
+void dma_resv_reset_shared_max(struct dma_resv *obj)
+{
+ /* Test shared fence slot reservation */
+ if (rcu_access_pointer(obj->fence)) {
+ struct dma_resv_list *fence = dma_resv_get_list(obj);
+
+ fence->shared_max = fence->shared_count;
+ }
+}
+#endif
+
/**
* dma_resv_add_shared_fence - Add a fence to a shared slot
* @obj: the reservation object
diff --git a/include/linux/dma-resv.h b/include/linux/dma-resv.h
index d44a77e8a7e3..f32a3d176513 100644
--- a/include/linux/dma-resv.h
+++ b/include/linux/dma-resv.h
@@ -92,6 +92,12 @@ static inline struct dma_resv_list *dma_resv_get_list(struct dma_resv *obj)
dma_resv_held(obj));
}
+#ifdef CONFIG_DEBUG_MUTEXES
+void dma_resv_reset_shared_max(struct dma_resv *obj);
+#else
+static inline void dma_resv_reset_shared_max(struct dma_resv *obj) {}
+#endif
+
/**
* dma_resv_lock - lock the reservation object
* @obj: the reservation object
@@ -215,14 +221,7 @@ static inline struct ww_acquire_ctx *dma_resv_locking_ctx(struct dma_resv *obj)
*/
static inline void dma_resv_unlock(struct dma_resv *obj)
{
-#ifdef CONFIG_DEBUG_MUTEXES
- /* Test shared fence slot reservation */
- if (rcu_access_pointer(obj->fence)) {
- struct dma_resv_list *fence = dma_resv_get_list(obj);
-
- fence->shared_max = fence->shared_count;
- }
-#endif
+ dma_resv_reset_shared_max(obj);
ww_mutex_unlock(&obj->lock);
}
--
2.25.1
next prev parent reply other threads:[~2021-05-17 14:11 UTC|newest]
Thread overview: 50+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-05-17 14:11 [RFC] Add DMA_RESV_USAGE flags Christian König
2021-05-17 14:11 ` [PATCH 01/11] dma-buf: fix invalid debug print Christian König
2021-05-17 14:11 ` [PATCH 02/11] dma-buf: add SPDX header and fix style in dma-resv.c Christian König
2021-05-17 14:11 ` Christian König [this message]
2021-05-17 14:11 ` [PATCH 04/11] dma-buf: rename and cleanup dma_resv_get_excl Christian König
2021-05-17 14:11 ` [PATCH 05/11] dma-buf: rename and cleanup dma_resv_get_list Christian König
2021-05-17 14:11 ` [PATCH 06/11] dma-buf: add dma_resv_list_fence helper Christian König
2021-05-17 14:11 ` [PATCH 07/11] dma-buf: add dma_resv_replace_shared Christian König
2021-05-17 14:11 ` [PATCH 08/11] dma-buf: improve shared fence abstraction Christian König
2021-05-17 14:11 ` [PATCH 09/11] dma-buf: add shared fence usage flags Christian König
2021-05-17 20:36 ` Daniel Vetter
2021-05-18 12:54 ` Christian König
2021-05-17 14:11 ` [PATCH 10/11] drm/i915: also wait for shared dmabuf fences before flip Christian König
2021-05-17 14:11 ` [PATCH 11/11] drm/amdgpu: fix shared access to exported DMA-bufs Christian König
2021-05-17 15:04 ` [RFC] Add DMA_RESV_USAGE flags Daniel Vetter
2021-05-17 19:38 ` Christian König
2021-05-17 20:15 ` Jason Ekstrand
2021-05-17 20:15 ` Daniel Vetter
2021-05-17 22:49 ` Jason Ekstrand
2021-05-18 5:59 ` Daniel Vetter
2021-05-18 10:29 ` Daniel Vetter
2021-05-18 12:49 ` Christian König
2021-05-18 13:26 ` Daniel Stone
2021-05-18 13:51 ` Christian König
2021-05-18 16:48 ` Daniel Vetter
2021-05-18 17:40 ` Christian König
2021-05-18 21:17 ` Daniel Vetter
2021-05-18 22:06 ` Jason Ekstrand
2021-05-19 10:52 ` Michel Dänzer
2021-05-19 15:21 ` Jason Ekstrand
2021-05-19 15:48 ` Michel Dänzer
2021-05-20 7:55 ` Daniel Vetter
2021-05-20 8:13 ` Michel Dänzer
2021-05-20 10:00 ` Christian König
2021-05-20 14:18 ` Daniel Vetter
2021-05-20 14:30 ` Michel Dänzer
2021-05-20 17:08 ` Jason Ekstrand
2021-05-31 12:49 ` Michel Dänzer
2021-05-20 10:50 ` Christian König
2021-05-20 17:23 ` Jason Ekstrand
2021-05-20 19:04 ` Jason Ekstrand
2021-05-20 19:14 ` Daniel Vetter
2021-05-21 7:27 ` Christian König
2021-05-21 9:36 ` Bas Nieuwenhuizen
2021-05-21 7:24 ` Christian König
2021-05-19 11:43 ` Christian König
2021-05-19 15:35 ` Jason Ekstrand
2021-05-19 11:24 ` Christian König
2021-05-20 7:58 ` Daniel Vetter
2021-05-18 21:31 ` 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=20210517141129.2225-4-christian.koenig@amd.com \
--to=ckoenig.leichtzumerken@gmail.com \
--cc=dri-devel@lists.freedesktop.org \
--cc=linaro-mm-sig@lists.linaro.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).