From: Tvrtko Ursulin <tvrtko.ursulin@linux.intel.com>
To: "Christian König" <ckoenig.leichtzumerken@gmail.com>,
linaro-mm-sig@lists.linaro.org, dri-devel@lists.freedesktop.org,
linux-media@vger.kernel.org, intel-gfx@lists.freedesktop.org
Cc: daniel@ffwll.ch
Subject: Re: [PATCH 09/28] dma-buf: use the new iterator in dma_resv_poll
Date: Tue, 5 Oct 2021 08:44:31 +0100 [thread overview]
Message-ID: <ef650439-a418-979b-56fb-4cf10f91747e@linux.intel.com> (raw)
In-Reply-To: <20211001100610.2899-10-christian.koenig@amd.com>
On 01/10/2021 11:05, Christian König wrote:
> Simplify the code a bit.
>
> Signed-off-by: Christian König <christian.koenig@amd.com>
> ---
> drivers/dma-buf/dma-buf.c | 36 ++++++------------------------------
> 1 file changed, 6 insertions(+), 30 deletions(-)
>
> diff --git a/drivers/dma-buf/dma-buf.c b/drivers/dma-buf/dma-buf.c
> index 8242b5d9baeb..beb504a92d60 100644
> --- a/drivers/dma-buf/dma-buf.c
> +++ b/drivers/dma-buf/dma-buf.c
> @@ -209,19 +209,14 @@ static void dma_buf_poll_cb(struct dma_fence *fence, struct dma_fence_cb *cb)
> dma_fence_put(fence);
> }
>
> -static bool dma_buf_poll_shared(struct dma_resv *resv,
> +static bool dma_buf_poll_add_cb(struct dma_resv *resv, bool write,
> struct dma_buf_poll_cb_t *dcb)
> {
> - struct dma_resv_list *fobj = dma_resv_shared_list(resv);
> + struct dma_resv_iter cursor;
> struct dma_fence *fence;
> - int i, r;
> -
> - if (!fobj)
> - return false;
> + int r;
>
> - for (i = 0; i < fobj->shared_count; ++i) {
> - fence = rcu_dereference_protected(fobj->shared[i],
> - dma_resv_held(resv));
> + dma_resv_for_each_fence(&cursor, resv, write, fence) {
> dma_fence_get(fence);
> r = dma_fence_add_callback(fence, &dcb->cb, dma_buf_poll_cb);
> if (!r)
It is unchanged with this patch, but are the semantics supposed to be
like this? Signal poll event if _any_ of the shared fences has been
signaled?
Regards,
Tvrtko
> @@ -232,24 +227,6 @@ static bool dma_buf_poll_shared(struct dma_resv *resv,
> return false;
> }
>
> -static bool dma_buf_poll_excl(struct dma_resv *resv,
> - struct dma_buf_poll_cb_t *dcb)
> -{
> - struct dma_fence *fence = dma_resv_excl_fence(resv);
> - int r;
> -
> - if (!fence)
> - return false;
> -
> - dma_fence_get(fence);
> - r = dma_fence_add_callback(fence, &dcb->cb, dma_buf_poll_cb);
> - if (!r)
> - return true;
> - dma_fence_put(fence);
> -
> - return false;
> -}
> -
> static __poll_t dma_buf_poll(struct file *file, poll_table *poll)
> {
> struct dma_buf *dmabuf;
> @@ -282,8 +259,7 @@ static __poll_t dma_buf_poll(struct file *file, poll_table *poll)
> spin_unlock_irq(&dmabuf->poll.lock);
>
> if (events & EPOLLOUT) {
> - if (!dma_buf_poll_shared(resv, dcb) &&
> - !dma_buf_poll_excl(resv, dcb))
> + if (!dma_buf_poll_add_cb(resv, true, dcb))
> /* No callback queued, wake up any other waiters */
> dma_buf_poll_cb(NULL, &dcb->cb);
> else
> @@ -303,7 +279,7 @@ static __poll_t dma_buf_poll(struct file *file, poll_table *poll)
> spin_unlock_irq(&dmabuf->poll.lock);
>
> if (events & EPOLLIN) {
> - if (!dma_buf_poll_excl(resv, dcb))
> + if (!dma_buf_poll_add_cb(resv, false, dcb))
> /* No callback queued, wake up any other waiters */
> dma_buf_poll_cb(NULL, &dcb->cb);
> else
>
next prev parent reply other threads:[~2021-10-05 7:44 UTC|newest]
Thread overview: 49+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-10-01 10:05 Deploying new iterator interface for dma-buf Christian König
2021-10-01 10:05 ` [PATCH 01/28] dma-buf: add dma_resv_for_each_fence_unlocked v7 Christian König
2021-10-04 9:29 ` Tvrtko Ursulin
2021-10-04 9:53 ` Christian König
2021-10-04 10:34 ` Tvrtko Ursulin
2021-10-04 10:44 ` Christian König
2021-10-04 10:50 ` Tvrtko Ursulin
2021-10-04 12:59 ` Christian König
2021-10-04 13:15 ` Tvrtko Ursulin
2021-10-01 10:05 ` [PATCH 02/28] dma-buf: add dma_resv_for_each_fence Christian König
2021-10-01 10:05 ` [PATCH 03/28] dma-buf: add dma_resv selftest Christian König
2021-10-04 13:11 ` Tvrtko Ursulin
2021-10-01 10:05 ` [PATCH 04/28] dma-buf: use new iterator in dma_resv_copy_fences Christian König
2021-10-01 10:05 ` [PATCH 05/28] dma-buf: use new iterator in dma_resv_get_fences v3 Christian König
2021-10-01 10:05 ` [PATCH 06/28] dma-buf: use new iterator in dma_resv_wait_timeout Christian König
2021-10-01 10:05 ` [PATCH 07/28] dma-buf: use new iterator in dma_resv_test_signaled Christian König
2021-10-01 10:05 ` [PATCH 08/28] dma-buf: use the new iterator in dma_buf_debug_show Christian König
2021-10-05 7:35 ` Tvrtko Ursulin
2021-10-01 10:05 ` [PATCH 09/28] dma-buf: use the new iterator in dma_resv_poll Christian König
2021-10-05 7:44 ` Tvrtko Ursulin [this message]
2021-10-05 8:16 ` Christian König
2021-10-05 8:41 ` Tvrtko Ursulin
2021-10-01 10:05 ` [PATCH 10/28] drm/ttm: use the new iterator in ttm_bo_flush_all_fences Christian König
2021-10-01 10:05 ` [PATCH 11/28] drm/amdgpu: use the new iterator in amdgpu_sync_resv Christian König
2021-10-01 10:05 ` [PATCH 12/28] drm/amdgpu: use new iterator in amdgpu_ttm_bo_eviction_valuable Christian König
2021-10-01 10:05 ` [PATCH 13/28] drm/amdgpu: use new iterator in amdgpu_vm_prt_fini Christian König
2021-10-01 10:05 ` [PATCH 14/28] drm/msm: use new iterator in msm_gem_describe Christian König
2021-10-01 10:05 ` [PATCH 15/28] drm/radeon: use new iterator in radeon_sync_resv Christian König
2021-10-01 10:05 ` [PATCH 16/28] drm/scheduler: use new iterator in drm_sched_job_add_implicit_dependencies v2 Christian König
2021-10-01 10:05 ` [PATCH 17/28] drm/i915: use the new iterator in i915_gem_busy_ioctl v2 Christian König
2021-10-01 10:37 ` Tvrtko Ursulin
2021-10-01 10:39 ` Christian König
2021-10-01 10:06 ` [PATCH 18/28] drm/i915: use the new iterator in i915_sw_fence_await_reservation v3 Christian König
2021-10-01 10:06 ` [PATCH 19/28] drm/i915: use the new iterator in i915_request_await_object v2 Christian König
2021-10-01 10:06 ` [PATCH 20/28] drm/i915: use new iterator in i915_gem_object_wait_reservation Christian König
2021-10-01 10:06 ` [PATCH 21/28] drm/i915: use new iterator in i915_gem_object_wait_priority Christian König
2021-10-01 10:06 ` [PATCH 22/28] drm/i915: use new cursor in intel_prepare_plane_fb Christian König
2021-10-01 10:06 ` [PATCH 23/28] drm: use new iterator in drm_gem_fence_array_add_implicit v3 Christian König
2021-10-05 7:48 ` Tvrtko Ursulin
2021-10-01 10:06 ` [PATCH 24/28] drm: use new iterator in drm_gem_plane_helper_prepare_fb Christian König
2021-10-05 7:53 ` Tvrtko Ursulin
2021-10-05 10:27 ` Christian König
2021-10-05 10:47 ` Tvrtko Ursulin
2021-10-05 11:23 ` Christian König
2021-10-01 10:06 ` [PATCH 25/28] drm/nouveau: use the new iterator in nouveau_fence_sync Christian König
2021-10-01 10:06 ` [PATCH 26/28] drm/nouveau: use the new interator in nv50_wndw_prepare_fb Christian König
2021-10-01 10:06 ` [PATCH 27/28] drm/etnaviv: use new iterator in etnaviv_gem_describe Christian König
2021-10-01 10:06 ` [PATCH 28/28] drm/etnaviv: replace dma_resv_get_excl_unlocked Christian König
-- strict thread matches above, loose matches on Subject: below --
2021-10-05 11:37 Deploying new iterator interface for dma-buf Christian König
2021-10-05 11:37 ` [PATCH 09/28] dma-buf: use the new iterator in dma_resv_poll 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=ef650439-a418-979b-56fb-4cf10f91747e@linux.intel.com \
--to=tvrtko.ursulin@linux.intel.com \
--cc=ckoenig.leichtzumerken@gmail.com \
--cc=daniel@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