From: "Christian König" <ckoenig.leichtzumerken@gmail.com>
To: daniel@ffwll.ch, dri-devel@lists.freedesktop.org,
linaro-mm-sig@lists.linaro.org, linux-media@vger.kernel.org,
sumit.semwal@linaro.org
Subject: [PATCH 5/7] drm/msm: always wait for the exclusive fence
Date: Wed, 16 Jun 2021 10:26:53 +0200 [thread overview]
Message-ID: <20210616082655.111001-6-christian.koenig@amd.com> (raw)
In-Reply-To: <20210616082655.111001-1-christian.koenig@amd.com>
Drivers also need to to sync to the exclusive fence when
a shared one is present.
Completely untested since the driver won't even compile on !ARM.
Signed-off-by: Christian König <christian.koenig@amd.com>
---
drivers/gpu/drm/msm/msm_gem.c | 16 +++++++---------
1 file changed, 7 insertions(+), 9 deletions(-)
diff --git a/drivers/gpu/drm/msm/msm_gem.c b/drivers/gpu/drm/msm/msm_gem.c
index a94a43de95ef..72a07e311de3 100644
--- a/drivers/gpu/drm/msm/msm_gem.c
+++ b/drivers/gpu/drm/msm/msm_gem.c
@@ -817,17 +817,15 @@ int msm_gem_sync_object(struct drm_gem_object *obj,
struct dma_fence *fence;
int i, ret;
- fobj = dma_resv_shared_list(obj->resv);
- if (!fobj || (fobj->shared_count == 0)) {
- fence = dma_resv_excl_fence(obj->resv);
- /* don't need to wait on our own fences, since ring is fifo */
- if (fence && (fence->context != fctx->context)) {
- ret = dma_fence_wait(fence, true);
- if (ret)
- return ret;
- }
+ fence = dma_resv_excl_fence(obj->resv);
+ /* don't need to wait on our own fences, since ring is fifo */
+ if (fence && (fence->context != fctx->context)) {
+ ret = dma_fence_wait(fence, true);
+ if (ret)
+ return ret;
}
+ fobj = dma_resv_shared_list(obj->resv);
if (!exclusive || !fobj)
return 0;
--
2.25.1
next prev parent reply other threads:[~2021-06-16 8:27 UTC|newest]
Thread overview: 9+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-06-16 8:26 Fixing problems around shared fences and RCU in DMA-buf Christian König
2021-06-16 8:26 ` [PATCH 1/7] dma-buf: add some more kerneldoc to dma_resv_add_shared_fence Christian König
2021-06-17 19:26 ` Daniel Vetter
2021-06-16 8:26 ` [PATCH 2/7] dma-buf: fix and rework dma_buf_poll v2 Christian König
2021-06-16 8:26 ` [PATCH 3/7] dma-buf: fix dma_resv_test_signaled test_all handling v2 Christian König
2021-06-16 8:26 ` [PATCH 4/7] drm/nouveau: always wait for the exclusive fence Christian König
2021-06-16 8:26 ` Christian König [this message]
2021-06-16 8:26 ` [PATCH 6/7] drm/amdgpu: drop workaround for adding page table clears as shared fence Christian König
2021-06-16 8:26 ` [PATCH 7/7] drm/amdgpu: drop CS workaround adding the shared manually Christian König
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=20210616082655.111001-6-christian.koenig@amd.com \
--to=ckoenig.leichtzumerken@gmail.com \
--cc=daniel@ffwll.ch \
--cc=dri-devel@lists.freedesktop.org \
--cc=linaro-mm-sig@lists.linaro.org \
--cc=linux-media@vger.kernel.org \
--cc=sumit.semwal@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).