From: Maarten Lankhorst <maarten.lankhorst@linux.intel.com>
To: dri-devel@lists.freedesktop.org
Cc: intel-gfx@lists.freedesktop.org, linux-media@vger.kernel.org,
linaro-mm-sig@lists.linaro.org,
"Maarten Lankhorst" <maarten.lankhorst@linux.intel.com>,
"Christian König" <christian.koenig@amd.com>,
"Daniel Vetter" <daniel.vetter@ffwll.ch>
Subject: [Intel-gfx] [PATCH 2/2] dma-buf: Fix dma_resv_test_signaled.
Date: Fri, 15 Oct 2021 13:57:20 +0200 [thread overview]
Message-ID: <20211015115720.79958-3-maarten.lankhorst@linux.intel.com> (raw)
In-Reply-To: <20211015115720.79958-1-maarten.lankhorst@linux.intel.com>
Commit 7fa828cb9265 ("dma-buf: use new iterator in dma_resv_test_signaled")
accidentally forgot to test whether the dma-buf is actually signaled, breaking
pretty much everything depending on it.
Fixes: 7fa828cb9265 ("dma-buf: use new iterator in dma_resv_test_signaled")
Cc: Christian König <christian.koenig@amd.com>
Cc: Daniel Vetter <daniel.vetter@ffwll.ch>
Signed-off-by: Maarten Lankhorst <maarten.lankhorst@linux.intel.com>
---
drivers/dma-buf/dma-resv.c | 8 +++++---
1 file changed, 5 insertions(+), 3 deletions(-)
diff --git a/drivers/dma-buf/dma-resv.c b/drivers/dma-buf/dma-resv.c
index 70a8082660c5..37ab2875e469 100644
--- a/drivers/dma-buf/dma-resv.c
+++ b/drivers/dma-buf/dma-resv.c
@@ -655,14 +655,16 @@ bool dma_resv_test_signaled(struct dma_resv *obj, bool test_all)
{
struct dma_resv_iter cursor;
struct dma_fence *fence;
+ bool ret = true;
dma_resv_iter_begin(&cursor, obj, test_all);
dma_resv_for_each_fence_unlocked(&cursor, fence) {
- dma_resv_iter_end(&cursor);
- return false;
+ ret = dma_fence_is_signaled(fence);
+ if (!ret)
+ break;
}
dma_resv_iter_end(&cursor);
- return true;
+ return ret;
}
EXPORT_SYMBOL_GPL(dma_resv_test_signaled);
--
2.33.0
next prev parent reply other threads:[~2021-10-15 11:57 UTC|newest]
Thread overview: 11+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-10-15 11:57 [Intel-gfx] [PATCH 0/2] dma-buf: Fix breakages from dma_resv_iter conversion Maarten Lankhorst
2021-10-15 11:57 ` [Intel-gfx] [PATCH 1/2] dma-buf: Fix dma_resv_wait_timeout handling of timeout = 0 Maarten Lankhorst
2021-10-18 11:20 ` [Intel-gfx] [Linaro-mm-sig] " Christian König
2021-10-15 11:57 ` Maarten Lankhorst [this message]
2021-10-15 12:07 ` [Intel-gfx] [PATCH 2/2] dma-buf: Fix dma_resv_test_signaled Christian König
2021-10-15 12:52 ` Maarten Lankhorst
2021-10-15 12:56 ` [Intel-gfx] [Linaro-mm-sig] " Christian König
2021-10-21 12:08 ` Daniel Vetter
2021-10-15 12:38 ` [Intel-gfx] ✗ Fi.CI.CHECKPATCH: warning for dma-buf: Fix breakages from dma_resv_iter conversion Patchwork
2021-10-15 13:08 ` [Intel-gfx] ✓ Fi.CI.BAT: success " Patchwork
2021-10-15 19:58 ` [Intel-gfx] ✗ Fi.CI.IGT: 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=20211015115720.79958-3-maarten.lankhorst@linux.intel.com \
--to=maarten.lankhorst@linux.intel.com \
--cc=christian.koenig@amd.com \
--cc=daniel.vetter@ffwll.ch \
--cc=dri-devel@lists.freedesktop.org \
--cc=intel-gfx@lists.freedesktop.org \
--cc=linaro-mm-sig@lists.linaro.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: 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