On Thu, 21 Oct 2021 at 11:37, Maarten Lankhorst
<maarten.lankhorst@xxxxxxxxxxxxxxx> wrote:
>
> vma->obj and vma->resv are now never NULL, and some checks can be removed.
>
> Signed-off-by: Maarten Lankhorst <maarten.lankhorst@xxxxxxxxxxxxxxx>
> ---
> drivers/gpu/drm/i915/gt/intel_context.c | 2 +-
> .../gpu/drm/i915/gt/intel_ring_submission.c | 2 +-
> drivers/gpu/drm/i915/i915_vma.c | 48 ++++++++-----------
> drivers/gpu/drm/i915/i915_vma.h | 3 --
> 4 files changed, 22 insertions(+), 33 deletions(-)
>
> diff --git a/drivers/gpu/drm/i915/gt/intel_context.c b/drivers/gpu/drm/i915/gt/intel_context.c
> index 5634d14052bc..e0220ac0e9b6 100644
> --- a/drivers/gpu/drm/i915/gt/intel_context.c
> +++ b/drivers/gpu/drm/i915/gt/intel_context.c
> @@ -219,7 +219,7 @@ int __intel_context_do_pin_ww(struct intel_context *ce,
> */
>
> err = i915_gem_object_lock(ce->timeline->hwsp_ggtt->obj, ww);
> - if (!err && ce->ring->vma->obj)
> + if (!err)
> err = i915_gem_object_lock(ce->ring->vma->obj, ww);
> if (!err && ce->state)
> err = i915_gem_object_lock(ce->state->obj, ww);
> diff --git a/drivers/gpu/drm/i915/gt/intel_ring_submission.c b/drivers/gpu/drm/i915/gt/intel_ring_submission.c
> index 586dca1731ce..3e6fac0340ef 100644
> --- a/drivers/gpu/drm/i915/gt/intel_ring_submission.c
> +++ b/drivers/gpu/drm/i915/gt/intel_ring_submission.c
> @@ -1357,7 +1357,7 @@ int intel_ring_submission_setup(struct intel_engine_cs *engine)
> err = i915_gem_object_lock(timeline->hwsp_ggtt->obj, &ww);
> if (!err && gen7_wa_vma)
> err = i915_gem_object_lock(gen7_wa_vma->obj, &ww);
> - if (!err && engine->legacy.ring->vma->obj)
> + if (!err)
> err = i915_gem_object_lock(engine->legacy.ring->vma->obj, &ww);
> if (!err)
> err = intel_timeline_pin(timeline, &ww);
> diff --git a/drivers/gpu/drm/i915/i915_vma.c b/drivers/gpu/drm/i915/i915_vma.c
> index 1187f1956c20..aebfc232b58b 100644
> --- a/drivers/gpu/drm/i915/i915_vma.c
> +++ b/drivers/gpu/drm/i915/i915_vma.c
> @@ -40,12 +40,12 @@
>
> static struct kmem_cache *slab_vmas;
>
> -struct i915_vma *i915_vma_alloc(void)
> +static struct i915_vma *i915_vma_alloc(void)
> {
> return kmem_cache_zalloc(slab_vmas, GFP_KERNEL);
> }
>
> -void i915_vma_free(struct i915_vma *vma)
> +static void i915_vma_free(struct i915_vma *vma)
> {
I assume this belongs in the previous patch?
Otherwise,
Reviewed-by: Matthew Auld <matthew.auld@xxxxxxxxx>
> return kmem_cache_free(slab_vmas, vma);
> }
> @@ -426,10 +426,8 @@ int i915_vma_bind(struct i915_vma *vma,
>
> work->base.dma.error = 0; /* enable the queue_work() */
>
> - if (vma->obj) {
> - __i915_gem_object_pin_pages(vma->obj);
> - work->pinned = i915_gem_object_get(vma->obj);
> - }
> + __i915_gem_object_pin_pages(vma->obj);
> + work->pinned = i915_gem_object_get(vma->obj);
> } else {
> vma->ops->bind_vma(vma->vm, NULL, vma, cache_level, bind_flags);
> }
> @@ -670,7 +668,7 @@ i915_vma_insert(struct i915_vma *vma, u64 size, u64 alignment, u64 flags)
> }
>
> color = 0;
> - if (vma->obj && i915_vm_has_cache_coloring(vma->vm))
> + if (i915_vm_has_cache_coloring(vma->vm))
> color = vma->obj->cache_level;
>
> if (flags & PIN_OFFSET_FIXED) {
> @@ -795,17 +793,14 @@ static bool try_qad_pin(struct i915_vma *vma, unsigned int flags)
> static int vma_get_pages(struct i915_vma *vma)
> {
> int err = 0;
> - bool pinned_pages = false;
> + bool pinned_pages = true;
>
> if (atomic_add_unless(&vma->pages_count, 1, 0))
> return 0;
>
> - if (vma->obj) {
> - err = i915_gem_object_pin_pages(vma->obj);
> - if (err)
> - return err;
> - pinned_pages = true;
> - }
> + err = i915_gem_object_pin_pages(vma->obj);
> + if (err)
> + return err;
>
> /* Allocations ahoy! */
> if (mutex_lock_interruptible(&vma->pages_mutex)) {
> @@ -838,8 +833,8 @@ static void __vma_put_pages(struct i915_vma *vma, unsigned int count)
> if (atomic_sub_return(count, &vma->pages_count) == 0) {
> vma->ops->clear_pages(vma);
> GEM_BUG_ON(vma->pages);
> - if (vma->obj)
> - i915_gem_object_unpin_pages(vma->obj);
> +
> + i915_gem_object_unpin_pages(vma->obj);
> }
> mutex_unlock(&vma->pages_mutex);
> }
> @@ -875,7 +870,7 @@ int i915_vma_pin_ww(struct i915_vma *vma, struct i915_gem_ww_ctx *ww,
> int err;
>
> #ifdef CONFIG_PROVE_LOCKING
> - if (debug_locks && !WARN_ON(!ww) && vma->resv)
> + if (debug_locks && !WARN_ON(!ww))
> assert_vma_held(vma);
> #endif
>
> @@ -983,7 +978,7 @@ int i915_vma_pin_ww(struct i915_vma *vma, struct i915_gem_ww_ctx *ww,
>
> GEM_BUG_ON(!vma->pages);
> err = i915_vma_bind(vma,
> - vma->obj ? vma->obj->cache_level : 0,
> + vma->obj->cache_level,
> flags, work);
> if (err)
> goto err_remove;
> @@ -1037,7 +1032,7 @@ int i915_ggtt_pin(struct i915_vma *vma, struct i915_gem_ww_ctx *ww,
> GEM_BUG_ON(!i915_vma_is_ggtt(vma));
>
> #ifdef CONFIG_LOCKDEP
> - WARN_ON(!ww && vma->resv && dma_resv_held(vma->resv));
> + WARN_ON(!ww && dma_resv_held(vma->resv));
> #endif
>
> do {
> @@ -1116,6 +1111,7 @@ void i915_vma_reopen(struct i915_vma *vma)
> void i915_vma_release(struct kref *ref)
> {
> struct i915_vma *vma = container_of(ref, typeof(*vma), ref);
> + struct drm_i915_gem_object *obj = vma->obj;
>
> if (drm_mm_node_allocated(&vma->node)) {
> mutex_lock(&vma->vm->mutex);
> @@ -1126,15 +1122,11 @@ void i915_vma_release(struct kref *ref)
> }
> GEM_BUG_ON(i915_vma_is_active(vma));
>
> - if (vma->obj) {
> - struct drm_i915_gem_object *obj = vma->obj;
> -
> - spin_lock(&obj->vma.lock);
> - list_del(&vma->obj_link);
> - if (!RB_EMPTY_NODE(&vma->obj_node))
> - rb_erase(&vma->obj_node, &obj->vma.tree);
> - spin_unlock(&obj->vma.lock);
> - }
> + spin_lock(&obj->vma.lock);
> + list_del(&vma->obj_link);
> + if (!RB_EMPTY_NODE(&vma->obj_node))
> + rb_erase(&vma->obj_node, &obj->vma.tree);
> + spin_unlock(&obj->vma.lock);
>
> __i915_vma_remove_closed(vma);
> i915_vm_put(vma->vm);
> diff --git a/drivers/gpu/drm/i915/i915_vma.h b/drivers/gpu/drm/i915/i915_vma.h
> index b882fd7b5f99..423e0df81c87 100644
> --- a/drivers/gpu/drm/i915/i915_vma.h
> +++ b/drivers/gpu/drm/i915/i915_vma.h
> @@ -416,9 +416,6 @@ static inline void i915_vma_clear_scanout(struct i915_vma *vma)
> list_for_each_entry(V, &(OBJ)->vma.list, obj_link) \
> for_each_until(!i915_vma_is_ggtt(V))
>
> -struct i915_vma *i915_vma_alloc(void);
> -void i915_vma_free(struct i915_vma *vma);
> -
> struct i915_vma *i915_vma_make_unshrinkable(struct i915_vma *vma);
> void i915_vma_make_shrinkable(struct i915_vma *vma);
> void i915_vma_make_purgeable(struct i915_vma *vma);
> --
> 2.33.0
>
