All of lore.kernel.org
 help / color / mirror / Atom feed
From: "Christian König" <ckoenig.leichtzumerken@gmail.com>
To: thomas.hellstrom@linux.intel.com, sumit.semwal@linaro.org,
	gustavo@padovan.org, daniel.vetter@ffwll.ch, zackr@vmware.com,
	linux-media@vger.kernel.org, dri-devel@lists.freedesktop.org,
	intel-gfx@lists.freedesktop.org
Subject: [PATCH 08/11] dma-buf: add dma_fence_chain_contained helper
Date: Mon, 24 Jan 2022 14:03:25 +0100	[thread overview]
Message-ID: <20220124130328.2376-9-christian.koenig@amd.com> (raw)
In-Reply-To: <20220124130328.2376-1-christian.koenig@amd.com>

It's a reoccurring pattern that we need to extract the fence
from a dma_fence_chain object. Add a helper for this.

Signed-off-by: Christian König <christian.koenig@amd.com>
---
 drivers/dma-buf/dma-fence-chain.c |  6 ++----
 include/linux/dma-fence-chain.h   | 15 +++++++++++++++
 2 files changed, 17 insertions(+), 4 deletions(-)

diff --git a/drivers/dma-buf/dma-fence-chain.c b/drivers/dma-buf/dma-fence-chain.c
index 084c6927b735..06f8ef97c6e8 100644
--- a/drivers/dma-buf/dma-fence-chain.c
+++ b/drivers/dma-buf/dma-fence-chain.c
@@ -148,8 +148,7 @@ static bool dma_fence_chain_enable_signaling(struct dma_fence *fence)
 
 	dma_fence_get(&head->base);
 	dma_fence_chain_for_each(fence, &head->base) {
-		struct dma_fence_chain *chain = to_dma_fence_chain(fence);
-		struct dma_fence *f = chain ? chain->fence : fence;
+		struct dma_fence *f = dma_fence_chain_contained(fence);
 
 		dma_fence_get(f);
 		if (!dma_fence_add_callback(f, &head->cb, dma_fence_chain_cb)) {
@@ -165,8 +164,7 @@ static bool dma_fence_chain_enable_signaling(struct dma_fence *fence)
 static bool dma_fence_chain_signaled(struct dma_fence *fence)
 {
 	dma_fence_chain_for_each(fence, fence) {
-		struct dma_fence_chain *chain = to_dma_fence_chain(fence);
-		struct dma_fence *f = chain ? chain->fence : fence;
+		struct dma_fence *f = dma_fence_chain_contained(fence);
 
 		if (!dma_fence_is_signaled(f)) {
 			dma_fence_put(fence);
diff --git a/include/linux/dma-fence-chain.h b/include/linux/dma-fence-chain.h
index ee906b659694..10d51bcdf7b7 100644
--- a/include/linux/dma-fence-chain.h
+++ b/include/linux/dma-fence-chain.h
@@ -66,6 +66,21 @@ to_dma_fence_chain(struct dma_fence *fence)
 	return container_of(fence, struct dma_fence_chain, base);
 }
 
+/**
+ * dma_fence_chain_contained - return the contained fence
+ * @fence: the fence to test
+ *
+ * If the fence is a dma_fence_chain the function returns the fence contained
+ * inside the chain object, otherwise it returns the fence itself.
+ */
+static inline struct dma_fence *
+dma_fence_chain_contained(struct dma_fence *fence)
+{
+	struct dma_fence_chain *chain = to_dma_fence_chain(fence);
+
+	return chain ? chain->fence : fence;
+}
+
 /**
  * dma_fence_chain_alloc
  *
-- 
2.25.1


WARNING: multiple messages have this Message-ID (diff)
From: "Christian König" <ckoenig.leichtzumerken@gmail.com>
To: thomas.hellstrom@linux.intel.com, sumit.semwal@linaro.org,
	gustavo@padovan.org, daniel.vetter@ffwll.ch, zackr@vmware.com,
	linux-media@vger.kernel.org, dri-devel@lists.freedesktop.org,
	intel-gfx@lists.freedesktop.org
Subject: [Intel-gfx] [PATCH 08/11] dma-buf: add dma_fence_chain_contained helper
Date: Mon, 24 Jan 2022 14:03:25 +0100	[thread overview]
Message-ID: <20220124130328.2376-9-christian.koenig@amd.com> (raw)
In-Reply-To: <20220124130328.2376-1-christian.koenig@amd.com>

It's a reoccurring pattern that we need to extract the fence
from a dma_fence_chain object. Add a helper for this.

Signed-off-by: Christian König <christian.koenig@amd.com>
---
 drivers/dma-buf/dma-fence-chain.c |  6 ++----
 include/linux/dma-fence-chain.h   | 15 +++++++++++++++
 2 files changed, 17 insertions(+), 4 deletions(-)

diff --git a/drivers/dma-buf/dma-fence-chain.c b/drivers/dma-buf/dma-fence-chain.c
index 084c6927b735..06f8ef97c6e8 100644
--- a/drivers/dma-buf/dma-fence-chain.c
+++ b/drivers/dma-buf/dma-fence-chain.c
@@ -148,8 +148,7 @@ static bool dma_fence_chain_enable_signaling(struct dma_fence *fence)
 
 	dma_fence_get(&head->base);
 	dma_fence_chain_for_each(fence, &head->base) {
-		struct dma_fence_chain *chain = to_dma_fence_chain(fence);
-		struct dma_fence *f = chain ? chain->fence : fence;
+		struct dma_fence *f = dma_fence_chain_contained(fence);
 
 		dma_fence_get(f);
 		if (!dma_fence_add_callback(f, &head->cb, dma_fence_chain_cb)) {
@@ -165,8 +164,7 @@ static bool dma_fence_chain_enable_signaling(struct dma_fence *fence)
 static bool dma_fence_chain_signaled(struct dma_fence *fence)
 {
 	dma_fence_chain_for_each(fence, fence) {
-		struct dma_fence_chain *chain = to_dma_fence_chain(fence);
-		struct dma_fence *f = chain ? chain->fence : fence;
+		struct dma_fence *f = dma_fence_chain_contained(fence);
 
 		if (!dma_fence_is_signaled(f)) {
 			dma_fence_put(fence);
diff --git a/include/linux/dma-fence-chain.h b/include/linux/dma-fence-chain.h
index ee906b659694..10d51bcdf7b7 100644
--- a/include/linux/dma-fence-chain.h
+++ b/include/linux/dma-fence-chain.h
@@ -66,6 +66,21 @@ to_dma_fence_chain(struct dma_fence *fence)
 	return container_of(fence, struct dma_fence_chain, base);
 }
 
+/**
+ * dma_fence_chain_contained - return the contained fence
+ * @fence: the fence to test
+ *
+ * If the fence is a dma_fence_chain the function returns the fence contained
+ * inside the chain object, otherwise it returns the fence itself.
+ */
+static inline struct dma_fence *
+dma_fence_chain_contained(struct dma_fence *fence)
+{
+	struct dma_fence_chain *chain = to_dma_fence_chain(fence);
+
+	return chain ? chain->fence : fence;
+}
+
 /**
  * dma_fence_chain_alloc
  *
-- 
2.25.1


  parent reply	other threads:[~2022-01-24 13:03 UTC|newest]

Thread overview: 43+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2022-01-24 13:03 Add WARN_ON nested dma_fence containers Christian König
2022-01-24 13:03 ` [Intel-gfx] " Christian König
2022-01-24 13:03 ` [PATCH 01/11] drm/radeon: use ttm_resource_manager_debug Christian König
2022-01-24 13:03   ` [Intel-gfx] " Christian König
2022-01-24 16:33   ` Thomas Hellström
2022-01-24 16:33     ` [Intel-gfx] " Thomas Hellström
2022-01-24 20:21     ` Christian König
2022-01-24 20:21       ` [Intel-gfx] " Christian König
2022-01-24 13:03 ` [PATCH 02/11] drm/amdgpu: " Christian König
2022-01-24 13:03   ` [Intel-gfx] " Christian König
2022-01-24 13:03 ` [PATCH 03/11] dma-buf: consolidate dma_fence subclass checking Christian König
2022-01-24 13:03   ` [Intel-gfx] " Christian König
2022-01-24 13:03 ` [PATCH 04/11] dma-buf: warn about dma_fence_array container rules v2 Christian König
2022-01-24 13:03   ` [Intel-gfx] " Christian König
2022-01-24 16:32   ` Thomas Hellström
2022-01-24 16:32     ` [Intel-gfx] " Thomas Hellström
2022-01-24 13:03 ` [PATCH 05/11] dma-buf: Warn about dma_fence_chain " Christian König
2022-01-24 13:03   ` [Intel-gfx] " Christian König
2022-01-24 13:03 ` [PATCH 06/11] dma-buf: warn about containers in dma_resv object Christian König
2022-01-24 13:03   ` [Intel-gfx] " Christian König
2022-01-24 16:36   ` Thomas Hellström (Intel)
2022-01-24 20:22     ` Christian König
2022-01-24 13:03 ` [PATCH 07/11] dma-buf: Add dma_fence_array_for_each (v2) Christian König
2022-01-24 13:03   ` [Intel-gfx] " Christian König
2022-01-24 13:03 ` Christian König [this message]
2022-01-24 13:03   ` [Intel-gfx] [PATCH 08/11] dma-buf: add dma_fence_chain_contained helper Christian König
2022-01-24 16:52   ` Thomas Hellström
2022-01-24 16:52     ` [Intel-gfx] " Thomas Hellström
2022-01-24 13:03 ` [PATCH 09/11] drm/amdgpu: use dma_fence_chain_contained Christian König
2022-01-24 13:03   ` [Intel-gfx] " Christian König
2022-01-24 13:03 ` [PATCH 10/11] drm/i915: use dma_fence extractor functions Christian König
2022-01-24 13:03   ` [Intel-gfx] " Christian König
2022-01-29  8:31   ` [drm/i915] 9366257fc0: igt.i915_pm_rc6_residency.rc6-idle.fail kernel test robot
2022-01-29  8:31     ` kernel test robot
2022-01-29  8:31     ` kernel test robot
2022-01-29  8:31     ` [Intel-gfx] " kernel test robot
2022-01-24 13:03 ` [PATCH 11/11] drm/vmwgfx: remove vmw_wait_dma_fence Christian König
2022-01-24 13:03   ` [Intel-gfx] " Christian König
2022-01-24 15:25   ` Zack Rusin
2022-01-24 15:25     ` [Intel-gfx] " Zack Rusin
2022-01-24 21:41 ` [Intel-gfx] ✗ Fi.CI.CHECKPATCH: warning for series starting with [01/11] drm/radeon: use ttm_resource_manager_debug Patchwork
2022-01-24 21:43 ` [Intel-gfx] ✗ Fi.CI.SPARSE: " Patchwork
2022-01-24 22:14 ` [Intel-gfx] ✗ Fi.CI.BAT: failure " Patchwork

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=20220124130328.2376-9-christian.koenig@amd.com \
    --to=ckoenig.leichtzumerken@gmail.com \
    --cc=daniel.vetter@ffwll.ch \
    --cc=dri-devel@lists.freedesktop.org \
    --cc=gustavo@padovan.org \
    --cc=intel-gfx@lists.freedesktop.org \
    --cc=linux-media@vger.kernel.org \
    --cc=sumit.semwal@linaro.org \
    --cc=thomas.hellstrom@linux.intel.com \
    --cc=zackr@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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.