[PATCH 1/8] drm/i915: Remove unused bits of i915_vma/active api

[Jason Ekstrand]

On Tue, Aug 3, 2021 at 7:44 AM Maarten Lankhorst
<maarten.lankhorst at linux.intel.com> wrote:
>
> When reworking the code to move the eviction fence to the object,
> the best code is removed code.
>
> Remove some functions that are unused, and change the function definition
> if it's only used in 1 place.
>
> Signed-off-by: Maarten Lankhorst <maarten.lankhorst at linux.intel.com>

Reviewed-by: Jason Ekstrand <jason at jlekstrand.net>

> ---
>  drivers/gpu/drm/i915/i915_active.c | 28 +++-------------------------
>  drivers/gpu/drm/i915/i915_active.h | 17 +----------------
>  drivers/gpu/drm/i915/i915_vma.c    |  2 +-
>  drivers/gpu/drm/i915/i915_vma.h    |  2 --
>  4 files changed, 5 insertions(+), 44 deletions(-)
>
> diff --git a/drivers/gpu/drm/i915/i915_active.c b/drivers/gpu/drm/i915/i915_active.c
> index 3103c1e1fd14..ee2b3a375362 100644
> --- a/drivers/gpu/drm/i915/i915_active.c
> +++ b/drivers/gpu/drm/i915/i915_active.c
> @@ -426,8 +426,9 @@ replace_barrier(struct i915_active *ref, struct i915_active_fence *active)
>         return true;
>  }
>
> -int i915_active_ref(struct i915_active *ref, u64 idx, struct dma_fence *fence)
> +int i915_active_add_request(struct i915_active *ref, struct i915_request *rq)
>  {
> +       struct dma_fence *fence = &rq->fence;
>         struct i915_active_fence *active;
>         int err;
>
> @@ -436,7 +437,7 @@ int i915_active_ref(struct i915_active *ref, u64 idx, struct dma_fence *fence)
>         if (err)
>                 return err;
>
> -       active = active_instance(ref, idx);
> +       active = active_instance(ref, i915_request_timeline(rq)->fence_context);
>         if (!active) {
>                 err = -ENOMEM;
>                 goto out;
> @@ -477,29 +478,6 @@ __i915_active_set_fence(struct i915_active *ref,
>         return prev;
>  }
>
> -static struct i915_active_fence *
> -__active_fence(struct i915_active *ref, u64 idx)
> -{
> -       struct active_node *it;
> -
> -       it = __active_lookup(ref, idx);
> -       if (unlikely(!it)) { /* Contention with parallel tree builders! */
> -               spin_lock_irq(&ref->tree_lock);
> -               it = __active_lookup(ref, idx);
> -               spin_unlock_irq(&ref->tree_lock);
> -       }
> -       GEM_BUG_ON(!it); /* slot must be preallocated */
> -
> -       return &it->base;
> -}
> -
> -struct dma_fence *
> -__i915_active_ref(struct i915_active *ref, u64 idx, struct dma_fence *fence)
> -{
> -       /* Only valid while active, see i915_active_acquire_for_context() */
> -       return __i915_active_set_fence(ref, __active_fence(ref, idx), fence);
> -}
> -
>  struct dma_fence *
>  i915_active_set_exclusive(struct i915_active *ref, struct dma_fence *f)
>  {
> diff --git a/drivers/gpu/drm/i915/i915_active.h b/drivers/gpu/drm/i915/i915_active.h
> index 5fcdb0e2bc9e..7eb44132183a 100644
> --- a/drivers/gpu/drm/i915/i915_active.h
> +++ b/drivers/gpu/drm/i915/i915_active.h
> @@ -164,26 +164,11 @@ void __i915_active_init(struct i915_active *ref,
>         __i915_active_init(ref, active, retire, flags, &__mkey, &__wkey);       \
>  } while (0)
>
> -struct dma_fence *
> -__i915_active_ref(struct i915_active *ref, u64 idx, struct dma_fence *fence);
> -int i915_active_ref(struct i915_active *ref, u64 idx, struct dma_fence *fence);
> -
> -static inline int
> -i915_active_add_request(struct i915_active *ref, struct i915_request *rq)
> -{
> -       return i915_active_ref(ref,
> -                              i915_request_timeline(rq)->fence_context,
> -                              &rq->fence);
> -}
> +int i915_active_add_request(struct i915_active *ref, struct i915_request *rq);
>
>  struct dma_fence *
>  i915_active_set_exclusive(struct i915_active *ref, struct dma_fence *f);
>
> -static inline bool i915_active_has_exclusive(struct i915_active *ref)
> -{
> -       return rcu_access_pointer(ref->excl.fence);
> -}
> -
>  int __i915_active_wait(struct i915_active *ref, int state);
>  static inline int i915_active_wait(struct i915_active *ref)
>  {
> diff --git a/drivers/gpu/drm/i915/i915_vma.c b/drivers/gpu/drm/i915/i915_vma.c
> index 4b7fc4647e46..f9ac33e0bac9 100644
> --- a/drivers/gpu/drm/i915/i915_vma.c
> +++ b/drivers/gpu/drm/i915/i915_vma.c
> @@ -1220,7 +1220,7 @@ __i915_request_await_bind(struct i915_request *rq, struct i915_vma *vma)
>         return __i915_request_await_exclusive(rq, &vma->active);
>  }
>
> -int __i915_vma_move_to_active(struct i915_vma *vma, struct i915_request *rq)
> +static int __i915_vma_move_to_active(struct i915_vma *vma, struct i915_request *rq)
>  {
>         int err;
>
> diff --git a/drivers/gpu/drm/i915/i915_vma.h b/drivers/gpu/drm/i915/i915_vma.h
> index ed69f66c7ab0..1c930515ec3d 100644
> --- a/drivers/gpu/drm/i915/i915_vma.h
> +++ b/drivers/gpu/drm/i915/i915_vma.h
> @@ -55,8 +55,6 @@ static inline bool i915_vma_is_active(const struct i915_vma *vma)
>  /* do not reserve memory to prevent deadlocks */
>  #define __EXEC_OBJECT_NO_RESERVE BIT(31)
>
> -int __must_check __i915_vma_move_to_active(struct i915_vma *vma,
> -                                          struct i915_request *rq);
>  int __must_check i915_vma_move_to_active(struct i915_vma *vma,
>                                          struct i915_request *rq,
>                                          unsigned int flags);
> --
> 2.31.0
>