From: Niranjana Vishwanathapura <niranjana.vishwanathapura@intel.com>
To: Matthew Auld <matthew.auld@intel.com>
Cc: matthew.brost@intel.com, paulo.r.zanoni@intel.com,
tvrtko.ursulin@intel.com, jani.nikula@intel.com,
intel-gfx@lists.freedesktop.org, dri-devel@lists.freedesktop.org,
thomas.hellstrom@intel.com, lionel.g.landwerlin@intel.com,
jason@jlekstrand.net, andi.shyti@linux.intel.com,
daniel.vetter@intel.com, christian.koenig@amd.com
Subject: Re: [PATCH 02/16] drm/i915/vm_bind: Add __i915_sw_fence_await_reservation()
Date: Wed, 28 Sep 2022 22:20:12 -0700 [thread overview]
Message-ID: <20220929052012.GG16345@nvishwa1-DESK> (raw)
In-Reply-To: <6243198e-8b93-2e45-8f49-cd6dd4e4c3a8@intel.com>
On Wed, Sep 28, 2022 at 06:39:05PM +0100, Matthew Auld wrote:
>On 28/09/2022 07:19, Niranjana Vishwanathapura wrote:
>>Add function __i915_sw_fence_await_reservation() for
>>asynchronous wait on a dma-resv object with specified
>>dma_resv_usage. This is required for async vma unbind
>>with vm_bind.
>>
>>Signed-off-by: Niranjana Vishwanathapura <niranjana.vishwanathapura@intel.com>
>>---
>> drivers/gpu/drm/i915/i915_sw_fence.c | 28 +++++++++++++++++++++-------
>> drivers/gpu/drm/i915/i915_sw_fence.h | 23 +++++++++++++++++------
>> 2 files changed, 38 insertions(+), 13 deletions(-)
>>
>>diff --git a/drivers/gpu/drm/i915/i915_sw_fence.c b/drivers/gpu/drm/i915/i915_sw_fence.c
>>index cc2a8821d22a..b7a10c374a08 100644
>>--- a/drivers/gpu/drm/i915/i915_sw_fence.c
>>+++ b/drivers/gpu/drm/i915/i915_sw_fence.c
>>@@ -7,7 +7,6 @@
>> #include <linux/slab.h>
>> #include <linux/dma-fence.h>
>> #include <linux/irq_work.h>
>>-#include <linux/dma-resv.h>
>> #include "i915_sw_fence.h"
>> #include "i915_selftest.h"
>>@@ -569,11 +568,26 @@ int __i915_sw_fence_await_dma_fence(struct i915_sw_fence *fence,
>> return ret;
>> }
>>-int i915_sw_fence_await_reservation(struct i915_sw_fence *fence,
>>- struct dma_resv *resv,
>>- bool write,
>>- unsigned long timeout,
>>- gfp_t gfp)
>>+/**
>>+ * __i915_sw_fence_await_reservation() - Setup a fence to wait on a dma-resv
>>+ * object with specified usage.
>>+ * @fence: the fence that needs to wait
>>+ * @resv: dma-resv object
>>+ * @usage: dma_resv_usage (See enum dma_resv_usage)
>>+ * @timeout: how long to wait in jiffies
>>+ * @gfp: allocation mode
>>+ *
>>+ * Setup the @fence to asynchronously wait on dma-resv object @resv for usage
>>+ * @usage to complete before signaling.
>
>s/usage @usage/@usage/ ?
Thanks for the review Matt.
Sure, will fix.
>
>>+ *
>>+ * Returns 0 if there is nothing to wait on, -ve upon error and >0 upon
>
>What does "-ve" mean btw?
>
-ve error code. Will update
Regards,
Niranjana
>Acked-by: Matthew Auld <matthew.auld@intel.com>
>
>>+ * successfully setting up the wait.
>>+ */
>>+int __i915_sw_fence_await_reservation(struct i915_sw_fence *fence,
>>+ struct dma_resv *resv,
>>+ enum dma_resv_usage usage,
>>+ unsigned long timeout,
>>+ gfp_t gfp)
>> {
>> struct dma_resv_iter cursor;
>> struct dma_fence *f;
>>@@ -582,7 +596,7 @@ int i915_sw_fence_await_reservation(struct i915_sw_fence *fence,
>> debug_fence_assert(fence);
>> might_sleep_if(gfpflags_allow_blocking(gfp));
>>- dma_resv_iter_begin(&cursor, resv, dma_resv_usage_rw(write));
>>+ dma_resv_iter_begin(&cursor, resv, usage);
>> dma_resv_for_each_fence_unlocked(&cursor, f) {
>> pending = i915_sw_fence_await_dma_fence(fence, f, timeout,
>> gfp);
>>diff --git a/drivers/gpu/drm/i915/i915_sw_fence.h b/drivers/gpu/drm/i915/i915_sw_fence.h
>>index f752bfc7c6e1..9c4859dc4c0d 100644
>>--- a/drivers/gpu/drm/i915/i915_sw_fence.h
>>+++ b/drivers/gpu/drm/i915/i915_sw_fence.h
>>@@ -10,13 +10,13 @@
>> #define _I915_SW_FENCE_H_
>> #include <linux/dma-fence.h>
>>+#include <linux/dma-resv.h>
>> #include <linux/gfp.h>
>> #include <linux/kref.h>
>> #include <linux/notifier.h> /* for NOTIFY_DONE */
>> #include <linux/wait.h>
>> struct completion;
>>-struct dma_resv;
>> struct i915_sw_fence;
>> enum i915_sw_fence_notify {
>>@@ -89,11 +89,22 @@ int i915_sw_fence_await_dma_fence(struct i915_sw_fence *fence,
>> unsigned long timeout,
>> gfp_t gfp);
>>-int i915_sw_fence_await_reservation(struct i915_sw_fence *fence,
>>- struct dma_resv *resv,
>>- bool write,
>>- unsigned long timeout,
>>- gfp_t gfp);
>>+int __i915_sw_fence_await_reservation(struct i915_sw_fence *fence,
>>+ struct dma_resv *resv,
>>+ enum dma_resv_usage usage,
>>+ unsigned long timeout,
>>+ gfp_t gfp);
>>+
>>+static inline int i915_sw_fence_await_reservation(struct i915_sw_fence *fence,
>>+ struct dma_resv *resv,
>>+ bool write,
>>+ unsigned long timeout,
>>+ gfp_t gfp)
>>+{
>>+ return __i915_sw_fence_await_reservation(fence, resv,
>>+ dma_resv_usage_rw(write),
>>+ timeout, gfp);
>>+}
>> bool i915_sw_fence_await(struct i915_sw_fence *fence);
>> void i915_sw_fence_complete(struct i915_sw_fence *fence);
next prev parent reply other threads:[~2022-09-29 5:20 UTC|newest]
Thread overview: 55+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-09-28 6:19 [PATCH 00/16] drm/i915/vm_bind: Add VM_BIND functionality Niranjana Vishwanathapura
2022-09-28 6:19 ` [PATCH 01/16] drm/i915/vm_bind: Expose vm lookup function Niranjana Vishwanathapura
2022-09-28 17:28 ` Matthew Auld
2022-09-28 6:19 ` [PATCH 02/16] drm/i915/vm_bind: Add __i915_sw_fence_await_reservation() Niranjana Vishwanathapura
2022-09-28 17:39 ` Matthew Auld
2022-09-29 5:20 ` Niranjana Vishwanathapura [this message]
2022-09-28 6:19 ` [PATCH 03/16] drm/i915/vm_bind: Expose i915_gem_object_max_page_size() Niranjana Vishwanathapura
2022-09-28 17:40 ` Matthew Auld
2022-09-29 5:20 ` Niranjana Vishwanathapura
2022-09-28 6:19 ` [PATCH 04/16] drm/i915/vm_bind: Add support to create persistent vma Niranjana Vishwanathapura
2022-09-28 7:38 ` [Intel-gfx] " Tvrtko Ursulin
2022-09-28 17:05 ` Niranjana Vishwanathapura
2022-09-28 14:44 ` Andi Shyti
2022-09-28 17:07 ` Niranjana Vishwanathapura
2022-09-29 17:04 ` Matthew Auld
2022-09-28 6:19 ` [PATCH 05/16] drm/i915/vm_bind: Implement bind and unbind of object Niranjana Vishwanathapura
2022-09-28 9:43 ` [Intel-gfx] " kernel test robot
2022-09-28 17:52 ` Matthew Auld
2022-09-29 5:24 ` Niranjana Vishwanathapura
2022-09-29 9:03 ` Matthew Auld
2022-09-29 10:51 ` Matthew Auld
2022-09-29 14:24 ` Niranjana Vishwanathapura
2022-09-28 20:06 ` [Intel-gfx] " Welty, Brian
2022-09-29 5:25 ` Niranjana Vishwanathapura
2022-09-29 10:49 ` Matthew Auld
2022-09-29 16:38 ` Niranjana Vishwanathapura
2022-09-29 17:28 ` Matthew Auld
2022-09-29 17:49 ` Niranjana Vishwanathapura
2022-09-28 6:19 ` [PATCH 06/16] drm/i915/vm_bind: Support for VM private BOs Niranjana Vishwanathapura
2022-09-28 17:54 ` Matthew Auld
2022-09-29 14:28 ` Niranjana Vishwanathapura
2022-09-28 6:19 ` [PATCH 07/16] drm/i915/vm_bind: Add support to handle object evictions Niranjana Vishwanathapura
2022-09-29 17:13 ` Matthew Auld
2022-09-28 6:19 ` [PATCH 08/16] drm/i915/vm_bind: Support persistent vma activeness tracking Niranjana Vishwanathapura
2022-09-30 12:00 ` Andi Shyti
2022-09-28 6:19 ` [PATCH 09/16] drm/i915/vm_bind: Add out fence support Niranjana Vishwanathapura
2022-09-28 6:19 ` [PATCH 10/16] drm/i915/vm_bind: Abstract out common execbuf functions Niranjana Vishwanathapura
2022-09-30 10:45 ` Matthew Auld
2022-09-30 16:26 ` Niranjana Vishwanathapura
2022-09-28 6:19 ` [PATCH 11/16] drm/i915/vm_bind: Use common execbuf functions in execbuf path Niranjana Vishwanathapura
2022-09-30 10:47 ` Matthew Auld
2022-09-28 6:19 ` [PATCH 12/16] drm/i915/vm_bind: Implement I915_GEM_EXECBUFFER3 ioctl Niranjana Vishwanathapura
2022-09-29 15:00 ` Matthew Auld
2022-09-29 16:02 ` Niranjana Vishwanathapura
2022-10-03 21:12 ` [Intel-gfx] " Niranjana Vishwanathapura
2022-09-28 6:19 ` [PATCH 13/16] drm/i915/vm_bind: Update i915_vma_verify_bind_complete() Niranjana Vishwanathapura
2022-09-28 6:19 ` [PATCH 14/16] drm/i915/vm_bind: Handle persistent vmas in execbuf3 Niranjana Vishwanathapura
2022-09-30 9:47 ` Matthew Auld
2022-10-02 6:28 ` Niranjana Vishwanathapura
2022-10-03 8:36 ` Matthew Auld
2022-10-05 5:38 ` Niranjana Vishwanathapura
2022-09-28 6:19 ` [PATCH 15/16] drm/i915/vm_bind: userptr dma-resv changes Niranjana Vishwanathapura
2022-09-28 6:19 ` [PATCH 16/16] drm/i915/vm_bind: Add uapi for user to enable vm_bind_mode Niranjana Vishwanathapura
2022-09-30 10:01 ` Matthew Auld
2022-09-30 16:13 ` Niranjana Vishwanathapura
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=20220929052012.GG16345@nvishwa1-DESK \
--to=niranjana.vishwanathapura@intel.com \
--cc=andi.shyti@linux.intel.com \
--cc=christian.koenig@amd.com \
--cc=daniel.vetter@intel.com \
--cc=dri-devel@lists.freedesktop.org \
--cc=intel-gfx@lists.freedesktop.org \
--cc=jani.nikula@intel.com \
--cc=jason@jlekstrand.net \
--cc=lionel.g.landwerlin@intel.com \
--cc=matthew.auld@intel.com \
--cc=matthew.brost@intel.com \
--cc=paulo.r.zanoni@intel.com \
--cc=thomas.hellstrom@intel.com \
--cc=tvrtko.ursulin@intel.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 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).