From: Daniel Vetter <daniel.vetter@ffwll.ch>
To: LKML <linux-kernel@vger.kernel.org>
Cc: DRI Development <dri-devel@lists.freedesktop.org>,
Intel Graphics Development <intel-gfx@lists.freedesktop.org>,
Daniel Vetter <daniel.vetter@ffwll.ch>,
Daniel Vetter <daniel.vetter@intel.com>,
Sumit Semwal <sumit.semwal@linaro.org>,
linux-media@vger.kernel.org, linaro-mm-sig@lists.linaro.org
Subject: [PATCH 2/3] dma-fence: use default wait function for mock fences
Date: Mon, 11 May 2020 11:11:41 +0200 [thread overview]
Message-ID: <20200511091142.208787-2-daniel.vetter@ffwll.ch> (raw)
In-Reply-To: <20200511091142.208787-1-daniel.vetter@ffwll.ch>
No need to micro-optmize when we're waiting in a mocked object ...
Signed-off-by: Daniel Vetter <daniel.vetter@intel.com>
Cc: Sumit Semwal <sumit.semwal@linaro.org>
Cc: linux-media@vger.kernel.org
Cc: linaro-mm-sig@lists.linaro.org
---
drivers/dma-buf/st-dma-fence.c | 41 ----------------------------------
1 file changed, 41 deletions(-)
diff --git a/drivers/dma-buf/st-dma-fence.c b/drivers/dma-buf/st-dma-fence.c
index e593064341c8..8166d2984702 100644
--- a/drivers/dma-buf/st-dma-fence.c
+++ b/drivers/dma-buf/st-dma-fence.c
@@ -33,50 +33,9 @@ static void mock_fence_release(struct dma_fence *f)
kmem_cache_free(slab_fences, to_mock_fence(f));
}
-struct wait_cb {
- struct dma_fence_cb cb;
- struct task_struct *task;
-};
-
-static void mock_wakeup(struct dma_fence *f, struct dma_fence_cb *cb)
-{
- wake_up_process(container_of(cb, struct wait_cb, cb)->task);
-}
-
-static long mock_wait(struct dma_fence *f, bool intr, long timeout)
-{
- const int state = intr ? TASK_INTERRUPTIBLE : TASK_UNINTERRUPTIBLE;
- struct wait_cb cb = { .task = current };
-
- if (dma_fence_add_callback(f, &cb.cb, mock_wakeup))
- return timeout;
-
- while (timeout) {
- set_current_state(state);
-
- if (test_bit(DMA_FENCE_FLAG_SIGNALED_BIT, &f->flags))
- break;
-
- if (signal_pending_state(state, current))
- break;
-
- timeout = schedule_timeout(timeout);
- }
- __set_current_state(TASK_RUNNING);
-
- if (!dma_fence_remove_callback(f, &cb.cb))
- return timeout;
-
- if (signal_pending_state(state, current))
- return -ERESTARTSYS;
-
- return -ETIME;
-}
-
static const struct dma_fence_ops mock_ops = {
.get_driver_name = mock_name,
.get_timeline_name = mock_name,
- .wait = mock_wait,
.release = mock_fence_release,
};
--
2.26.2
next prev parent reply other threads:[~2020-05-11 9:11 UTC|newest]
Thread overview: 16+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-05-11 9:11 [PATCH 1/3] drm/writeback: don't set fence->ops to default Daniel Vetter
2020-05-11 9:11 ` Daniel Vetter [this message]
2020-05-11 9:41 ` [PATCH 2/3] dma-fence: use default wait function for mock fences Chris Wilson
2020-05-11 10:12 ` Daniel Vetter
2020-05-11 18:13 ` [Intel-gfx] " Ruhl, Michael J
2020-05-11 18:17 ` Ruhl, Michael J
2020-05-11 9:11 ` [PATCH 3/3] misc/habalabs: don't set default fence_ops->wait Daniel Vetter
2020-05-11 9:36 ` Oded Gabbay
2020-05-11 9:43 ` Oded Gabbay
2020-05-12 2:14 ` [Intel-gfx] " Dave Airlie
2020-05-12 6:12 ` Daniel Vetter
2020-05-14 11:38 ` Oded Gabbay
2020-05-20 18:04 ` Daniel Vetter
2020-05-20 18:09 ` Oded Gabbay
2020-05-11 18:12 ` [PATCH 1/3] drm/writeback: don't set fence->ops to default Ruhl, Michael J
2020-05-20 18:03 ` Daniel Vetter
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=20200511091142.208787-2-daniel.vetter@ffwll.ch \
--to=daniel.vetter@ffwll.ch \
--cc=daniel.vetter@intel.com \
--cc=dri-devel@lists.freedesktop.org \
--cc=intel-gfx@lists.freedesktop.org \
--cc=linaro-mm-sig@lists.linaro.org \
--cc=linux-kernel@vger.kernel.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).