On Thu, Sep 22, 2022 at 02:39:16PM -0700, Niranjana Vishwanathapura wrote:
> The function parameter 'exclude' in funciton
> i915_sw_fence_await_reservation() is not used.
> Remove it.
>
> Reviewed-by: Tvrtko Ursulin <tvrtko.ursulin@xxxxxxxxx>
> Signed-off-by: Niranjana Vishwanathapura <niranjana.vishwanathapura@xxxxxxxxx>
pushed to drm-intel-next.
Thanks for the patch and review.
> ---
> drivers/gpu/drm/i915/display/intel_atomic_plane.c | 5 ++---
> drivers/gpu/drm/i915/gem/i915_gem_clflush.c | 2 +-
> drivers/gpu/drm/i915/i915_sw_fence.c | 1 -
> drivers/gpu/drm/i915/i915_sw_fence.h | 1 -
> 4 files changed, 3 insertions(+), 6 deletions(-)
>
> diff --git a/drivers/gpu/drm/i915/display/intel_atomic_plane.c b/drivers/gpu/drm/i915/display/intel_atomic_plane.c
> index aaa6708256d5..ecb8d71d36c0 100644
> --- a/drivers/gpu/drm/i915/display/intel_atomic_plane.c
> +++ b/drivers/gpu/drm/i915/display/intel_atomic_plane.c
> @@ -1005,7 +1005,7 @@ intel_prepare_plane_fb(struct drm_plane *_plane,
> */
> if (intel_crtc_needs_modeset(crtc_state)) {
> ret = i915_sw_fence_await_reservation(&state->commit_ready,
> - old_obj->base.resv, NULL,
> + old_obj->base.resv,
> false, 0,
> GFP_KERNEL);
> if (ret < 0)
> @@ -1039,8 +1039,7 @@ intel_prepare_plane_fb(struct drm_plane *_plane,
> struct dma_fence *fence;
>
> ret = i915_sw_fence_await_reservation(&state->commit_ready,
> - obj->base.resv, NULL,
> - false,
> + obj->base.resv, false,
> i915_fence_timeout(dev_priv),
> GFP_KERNEL);
> if (ret < 0)
> diff --git a/drivers/gpu/drm/i915/gem/i915_gem_clflush.c b/drivers/gpu/drm/i915/gem/i915_gem_clflush.c
> index 0512afdd20d8..b3b398fe689c 100644
> --- a/drivers/gpu/drm/i915/gem/i915_gem_clflush.c
> +++ b/drivers/gpu/drm/i915/gem/i915_gem_clflush.c
> @@ -113,7 +113,7 @@ bool i915_gem_clflush_object(struct drm_i915_gem_object *obj,
> clflush = clflush_work_create(obj);
> if (clflush) {
> i915_sw_fence_await_reservation(&clflush->base.chain,
> - obj->base.resv, NULL, true,
> + obj->base.resv, true,
> i915_fence_timeout(i915),
> I915_FENCE_GFP);
> dma_resv_add_fence(obj->base.resv, &clflush->base.dma,
> diff --git a/drivers/gpu/drm/i915/i915_sw_fence.c b/drivers/gpu/drm/i915/i915_sw_fence.c
> index 6fc0d1b89690..cc2a8821d22a 100644
> --- a/drivers/gpu/drm/i915/i915_sw_fence.c
> +++ b/drivers/gpu/drm/i915/i915_sw_fence.c
> @@ -571,7 +571,6 @@ int __i915_sw_fence_await_dma_fence(struct i915_sw_fence *fence,
>
> int i915_sw_fence_await_reservation(struct i915_sw_fence *fence,
> struct dma_resv *resv,
> - const struct dma_fence_ops *exclude,
> bool write,
> unsigned long timeout,
> gfp_t gfp)
> diff --git a/drivers/gpu/drm/i915/i915_sw_fence.h b/drivers/gpu/drm/i915/i915_sw_fence.h
> index 619fc5a22f0c..f752bfc7c6e1 100644
> --- a/drivers/gpu/drm/i915/i915_sw_fence.h
> +++ b/drivers/gpu/drm/i915/i915_sw_fence.h
> @@ -91,7 +91,6 @@ int i915_sw_fence_await_dma_fence(struct i915_sw_fence *fence,
>
> int i915_sw_fence_await_reservation(struct i915_sw_fence *fence,
> struct dma_resv *resv,
> - const struct dma_fence_ops *exclude,
> bool write,
> unsigned long timeout,
> gfp_t gfp);
> --
> 2.21.0.rc0.32.g243a4c7e27
>
