From: Niranjana Vishwanathapura <niranjana.vishwanathapura@intel.com> To: intel-gfx@lists.freedesktop.org, dri-devel@lists.freedesktop.org Cc: paulo.r.zanoni@intel.com, jani.nikula@intel.com, thomas.hellstrom@intel.com, matthew.auld@intel.com, daniel.vetter@intel.com, christian.koenig@amd.com Subject: [Intel-gfx] [PATCH 13/16] drm/i915/vm_bind: Update i915_vma_verify_bind_complete() Date: Tue, 27 Sep 2022 23:19:15 -0700 [thread overview] Message-ID: <20220928061918.6340-14-niranjana.vishwanathapura@intel.com> (raw) In-Reply-To: <20220928061918.6340-1-niranjana.vishwanathapura@intel.com> Ensure i915_vma_verify_bind_complete() handles case where bind is not initiated. Also make it non static, add documentation and move it out of CONFIG_DRM_I915_DEBUG_GEM. Signed-off-by: Niranjana Vishwanathapura <niranjana.vishwanathapura@intel.com> Signed-off-by: Andi Shyti <andi.shyti@linux.intel.com> --- drivers/gpu/drm/i915/i915_vma.c | 16 +++++++++++----- drivers/gpu/drm/i915/i915_vma.h | 1 + 2 files changed, 12 insertions(+), 5 deletions(-) diff --git a/drivers/gpu/drm/i915/i915_vma.c b/drivers/gpu/drm/i915/i915_vma.c index e552453e06e3..499a7a5986c8 100644 --- a/drivers/gpu/drm/i915/i915_vma.c +++ b/drivers/gpu/drm/i915/i915_vma.c @@ -439,12 +439,21 @@ int i915_vma_sync(struct i915_vma *vma) return i915_vm_sync(vma->vm); } -#if IS_ENABLED(CONFIG_DRM_I915_DEBUG_GEM) -static int i915_vma_verify_bind_complete(struct i915_vma *vma) +/** + * i915_vma_verify_bind_complete() - Check for the bind completion of the vma + * @vma: vma to check for bind completion + * + * Returns: 0 if the vma bind is completed. Error code otherwise. + */ +int i915_vma_verify_bind_complete(struct i915_vma *vma) { struct dma_fence *fence = i915_active_fence_get(&vma->active.excl); int err; + /* Ensure vma bind is initiated */ + if (!i915_vma_is_bound(vma, I915_VMA_BIND_MASK)) + return -EINVAL; + if (!fence) return 0; @@ -457,9 +466,6 @@ static int i915_vma_verify_bind_complete(struct i915_vma *vma) return err; } -#else -#define i915_vma_verify_bind_complete(_vma) 0 -#endif I915_SELFTEST_EXPORT void i915_vma_resource_init_from_vma(struct i915_vma_resource *vma_res, diff --git a/drivers/gpu/drm/i915/i915_vma.h b/drivers/gpu/drm/i915/i915_vma.h index 02eaf36a2a4c..cd397a0a3b91 100644 --- a/drivers/gpu/drm/i915/i915_vma.h +++ b/drivers/gpu/drm/i915/i915_vma.h @@ -437,6 +437,7 @@ void i915_vma_make_purgeable(struct i915_vma *vma); int i915_vma_wait_for_bind(struct i915_vma *vma); int i915_vma_sync(struct i915_vma *vma); +int i915_vma_verify_bind_complete(struct i915_vma *vma); /** * i915_vma_get_current_resource - Get the current resource of the vma -- 2.21.0.rc0.32.g243a4c7e27
WARNING: multiple messages have this Message-ID (diff)
From: Niranjana Vishwanathapura <niranjana.vishwanathapura@intel.com> To: intel-gfx@lists.freedesktop.org, dri-devel@lists.freedesktop.org Cc: matthew.brost@intel.com, paulo.r.zanoni@intel.com, tvrtko.ursulin@intel.com, jani.nikula@intel.com, lionel.g.landwerlin@intel.com, thomas.hellstrom@intel.com, matthew.auld@intel.com, jason@jlekstrand.net, andi.shyti@linux.intel.com, daniel.vetter@intel.com, christian.koenig@amd.com Subject: [PATCH 13/16] drm/i915/vm_bind: Update i915_vma_verify_bind_complete() Date: Tue, 27 Sep 2022 23:19:15 -0700 [thread overview] Message-ID: <20220928061918.6340-14-niranjana.vishwanathapura@intel.com> (raw) In-Reply-To: <20220928061918.6340-1-niranjana.vishwanathapura@intel.com> Ensure i915_vma_verify_bind_complete() handles case where bind is not initiated. Also make it non static, add documentation and move it out of CONFIG_DRM_I915_DEBUG_GEM. Signed-off-by: Niranjana Vishwanathapura <niranjana.vishwanathapura@intel.com> Signed-off-by: Andi Shyti <andi.shyti@linux.intel.com> --- drivers/gpu/drm/i915/i915_vma.c | 16 +++++++++++----- drivers/gpu/drm/i915/i915_vma.h | 1 + 2 files changed, 12 insertions(+), 5 deletions(-) diff --git a/drivers/gpu/drm/i915/i915_vma.c b/drivers/gpu/drm/i915/i915_vma.c index e552453e06e3..499a7a5986c8 100644 --- a/drivers/gpu/drm/i915/i915_vma.c +++ b/drivers/gpu/drm/i915/i915_vma.c @@ -439,12 +439,21 @@ int i915_vma_sync(struct i915_vma *vma) return i915_vm_sync(vma->vm); } -#if IS_ENABLED(CONFIG_DRM_I915_DEBUG_GEM) -static int i915_vma_verify_bind_complete(struct i915_vma *vma) +/** + * i915_vma_verify_bind_complete() - Check for the bind completion of the vma + * @vma: vma to check for bind completion + * + * Returns: 0 if the vma bind is completed. Error code otherwise. + */ +int i915_vma_verify_bind_complete(struct i915_vma *vma) { struct dma_fence *fence = i915_active_fence_get(&vma->active.excl); int err; + /* Ensure vma bind is initiated */ + if (!i915_vma_is_bound(vma, I915_VMA_BIND_MASK)) + return -EINVAL; + if (!fence) return 0; @@ -457,9 +466,6 @@ static int i915_vma_verify_bind_complete(struct i915_vma *vma) return err; } -#else -#define i915_vma_verify_bind_complete(_vma) 0 -#endif I915_SELFTEST_EXPORT void i915_vma_resource_init_from_vma(struct i915_vma_resource *vma_res, diff --git a/drivers/gpu/drm/i915/i915_vma.h b/drivers/gpu/drm/i915/i915_vma.h index 02eaf36a2a4c..cd397a0a3b91 100644 --- a/drivers/gpu/drm/i915/i915_vma.h +++ b/drivers/gpu/drm/i915/i915_vma.h @@ -437,6 +437,7 @@ void i915_vma_make_purgeable(struct i915_vma *vma); int i915_vma_wait_for_bind(struct i915_vma *vma); int i915_vma_sync(struct i915_vma *vma); +int i915_vma_verify_bind_complete(struct i915_vma *vma); /** * i915_vma_get_current_resource - Get the current resource of the vma -- 2.21.0.rc0.32.g243a4c7e27
next prev parent reply other threads:[~2022-09-28 6:21 UTC|newest] Thread overview: 108+ 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 ` [Intel-gfx] " Niranjana Vishwanathapura 2022-09-28 6:19 ` [PATCH 01/16] drm/i915/vm_bind: Expose vm lookup function Niranjana Vishwanathapura 2022-09-28 6:19 ` [Intel-gfx] " Niranjana Vishwanathapura 2022-09-28 17:28 ` Matthew Auld 2022-09-28 17:28 ` [Intel-gfx] " 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 6:19 ` [Intel-gfx] " Niranjana Vishwanathapura 2022-09-28 17:39 ` Matthew Auld 2022-09-28 17:39 ` [Intel-gfx] " Matthew Auld 2022-09-29 5:20 ` Niranjana Vishwanathapura 2022-09-29 5:20 ` [Intel-gfx] " Niranjana Vishwanathapura 2022-09-28 6:19 ` [PATCH 03/16] drm/i915/vm_bind: Expose i915_gem_object_max_page_size() Niranjana Vishwanathapura 2022-09-28 6:19 ` [Intel-gfx] " Niranjana Vishwanathapura 2022-09-28 17:40 ` Matthew Auld 2022-09-28 17:40 ` [Intel-gfx] " Matthew Auld 2022-09-29 5:20 ` Niranjana Vishwanathapura 2022-09-29 5:20 ` [Intel-gfx] " 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 6:19 ` [Intel-gfx] " Niranjana Vishwanathapura 2022-09-28 7:38 ` Tvrtko Ursulin 2022-09-28 17:05 ` Niranjana Vishwanathapura 2022-09-28 14:44 ` Andi Shyti 2022-09-28 14:44 ` [Intel-gfx] " Andi Shyti 2022-09-28 17:07 ` Niranjana Vishwanathapura 2022-09-28 17:07 ` [Intel-gfx] " Niranjana Vishwanathapura 2022-09-29 17:04 ` Matthew Auld 2022-09-29 17:04 ` [Intel-gfx] " 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 6:19 ` [Intel-gfx] " Niranjana Vishwanathapura 2022-09-28 9:43 ` kernel test robot 2022-09-28 9:43 ` kernel test robot 2022-09-28 17:52 ` Matthew Auld 2022-09-28 17:52 ` Matthew Auld 2022-09-29 5:24 ` Niranjana Vishwanathapura 2022-09-29 5:24 ` [Intel-gfx] " Niranjana Vishwanathapura 2022-09-29 9:03 ` Matthew Auld 2022-09-29 9:03 ` [Intel-gfx] " Matthew Auld 2022-09-29 10:51 ` Matthew Auld 2022-09-29 10:51 ` [Intel-gfx] " Matthew Auld 2022-09-29 14:24 ` Niranjana Vishwanathapura 2022-09-29 14:24 ` [Intel-gfx] " Niranjana Vishwanathapura 2022-09-28 20:06 ` Welty, Brian 2022-09-29 5:25 ` Niranjana Vishwanathapura 2022-09-29 10:49 ` Matthew Auld 2022-09-29 10:49 ` [Intel-gfx] " Matthew Auld 2022-09-29 16:38 ` Niranjana Vishwanathapura 2022-09-29 16:38 ` [Intel-gfx] " Niranjana Vishwanathapura 2022-09-29 17:28 ` Matthew Auld 2022-09-29 17:28 ` Matthew Auld 2022-09-29 17:49 ` Niranjana Vishwanathapura 2022-09-29 17:49 ` [Intel-gfx] " Niranjana Vishwanathapura 2022-09-28 6:19 ` [PATCH 06/16] drm/i915/vm_bind: Support for VM private BOs Niranjana Vishwanathapura 2022-09-28 6:19 ` [Intel-gfx] " Niranjana Vishwanathapura 2022-09-28 17:54 ` Matthew Auld 2022-09-28 17:54 ` [Intel-gfx] " Matthew Auld 2022-09-29 14:28 ` Niranjana Vishwanathapura 2022-09-29 14:28 ` [Intel-gfx] " Niranjana Vishwanathapura 2022-09-28 6:19 ` [Intel-gfx] [PATCH 07/16] drm/i915/vm_bind: Add support to handle object evictions Niranjana Vishwanathapura 2022-09-28 6:19 ` Niranjana Vishwanathapura 2022-09-29 17:13 ` Matthew Auld 2022-09-29 17:13 ` [Intel-gfx] " Matthew Auld 2022-09-28 6:19 ` [Intel-gfx] [PATCH 08/16] drm/i915/vm_bind: Support persistent vma activeness tracking Niranjana Vishwanathapura 2022-09-28 6:19 ` Niranjana Vishwanathapura 2022-09-30 12:00 ` Andi Shyti 2022-09-30 12:00 ` [Intel-gfx] " Andi Shyti 2022-09-28 6:19 ` [Intel-gfx] [PATCH 09/16] drm/i915/vm_bind: Add out fence support Niranjana Vishwanathapura 2022-09-28 6:19 ` Niranjana Vishwanathapura 2022-09-28 6:19 ` [PATCH 10/16] drm/i915/vm_bind: Abstract out common execbuf functions Niranjana Vishwanathapura 2022-09-28 6:19 ` [Intel-gfx] " Niranjana Vishwanathapura 2022-09-30 10:45 ` Matthew Auld 2022-09-30 10:45 ` [Intel-gfx] " Matthew Auld 2022-09-30 16:26 ` Niranjana Vishwanathapura 2022-09-30 16:26 ` [Intel-gfx] " 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-28 6:19 ` [Intel-gfx] " Niranjana Vishwanathapura 2022-09-30 10:47 ` Matthew Auld 2022-09-30 10:47 ` [Intel-gfx] " Matthew Auld 2022-09-28 6:19 ` [PATCH 12/16] drm/i915/vm_bind: Implement I915_GEM_EXECBUFFER3 ioctl Niranjana Vishwanathapura 2022-09-28 6:19 ` [Intel-gfx] " Niranjana Vishwanathapura 2022-09-29 15:00 ` Matthew Auld 2022-09-29 15:00 ` [Intel-gfx] " Matthew Auld 2022-09-29 16:02 ` Niranjana Vishwanathapura 2022-09-29 16:02 ` [Intel-gfx] " Niranjana Vishwanathapura 2022-10-03 21:12 ` Niranjana Vishwanathapura 2022-09-28 6:19 ` Niranjana Vishwanathapura [this message] 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-28 6:19 ` [Intel-gfx] " Niranjana Vishwanathapura 2022-09-30 9:47 ` Matthew Auld 2022-09-30 9:47 ` [Intel-gfx] " Matthew Auld 2022-10-02 6:28 ` Niranjana Vishwanathapura 2022-10-02 6:28 ` [Intel-gfx] " Niranjana Vishwanathapura 2022-10-03 8:36 ` Matthew Auld 2022-10-03 8:36 ` [Intel-gfx] " Matthew Auld 2022-10-05 5:38 ` Niranjana Vishwanathapura 2022-10-05 5:38 ` [Intel-gfx] " Niranjana Vishwanathapura 2022-09-28 6:19 ` [Intel-gfx] [PATCH 15/16] drm/i915/vm_bind: userptr dma-resv changes Niranjana Vishwanathapura 2022-09-28 6:19 ` 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-28 6:19 ` [Intel-gfx] " Niranjana Vishwanathapura 2022-09-30 10:01 ` Matthew Auld 2022-09-30 10:01 ` [Intel-gfx] " Matthew Auld 2022-09-30 16:13 ` Niranjana Vishwanathapura 2022-09-30 16:13 ` [Intel-gfx] " Niranjana Vishwanathapura 2022-09-28 13:34 ` [Intel-gfx] ✗ Fi.CI.CHECKPATCH: warning for drm/i915/vm_bind: Add VM_BIND functionality (rev4) Patchwork 2022-09-28 13:34 ` [Intel-gfx] ✗ Fi.CI.SPARSE: " Patchwork 2022-09-28 13:57 ` [Intel-gfx] ✗ Fi.CI.BAT: 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=20220928061918.6340-14-niranjana.vishwanathapura@intel.com \ --to=niranjana.vishwanathapura@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=matthew.auld@intel.com \ --cc=paulo.r.zanoni@intel.com \ --cc=thomas.hellstrom@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: linkBe sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.