[PATCH v3] dmr/amdgpu: Move fence SW fallback warning v3

[Alex Deucher]

On Tue, Sep 25, 2018 at 2:11 PM Andrey Grodzovsky
<andrey.grodzovsky at amd.com> wrote:
>
> Only print the warning if there was actually some fence processed
> from the SW fallback timer.
>
> v2: Add return value to amdgpu_fence_fallback to let
> amdgpu_fence_fallback know fences were actually
> processed and then print the warning.
>
> v3: Always return true if seq != last_seq
>
> Signed-off-by: Andrey Grodzovsky <andrey.grodzovsky at amd.com>

dmr -> drm in the patch title.  With that fixed:
Acked-by: Alex Deucher <alexander.deucher at amd.com>

> ---
>  drivers/gpu/drm/amd/amdgpu/amdgpu_fence.c | 12 ++++++++----
>  drivers/gpu/drm/amd/amdgpu/amdgpu_ring.h  |  2 +-
>  2 files changed, 9 insertions(+), 5 deletions(-)
>
> diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_fence.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_fence.c
> index 4e6e9c9..5448cf2 100644
> --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_fence.c
> +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_fence.c
> @@ -216,8 +216,10 @@ static void amdgpu_fence_schedule_fallback(struct amdgpu_ring *ring)
>   * Checks the current fence value and calculates the last
>   * signalled fence value. Wakes the fence queue if the
>   * sequence number has increased.
> + *
> + * Returns true if fence was processed
>   */
> -void amdgpu_fence_process(struct amdgpu_ring *ring)
> +bool amdgpu_fence_process(struct amdgpu_ring *ring)
>  {
>         struct amdgpu_fence_driver *drv = &ring->fence_drv;
>         uint32_t seq, last_seq;
> @@ -234,7 +236,7 @@ void amdgpu_fence_process(struct amdgpu_ring *ring)
>                 amdgpu_fence_schedule_fallback(ring);
>
>         if (unlikely(seq == last_seq))
> -               return;
> +               return false;
>
>         last_seq &= drv->num_fences_mask;
>         seq &= drv->num_fences_mask;
> @@ -261,6 +263,8 @@ void amdgpu_fence_process(struct amdgpu_ring *ring)
>
>                 dma_fence_put(fence);
>         } while (last_seq != seq);
> +
> +       return true;
>  }
>
>  /**
> @@ -275,8 +279,8 @@ static void amdgpu_fence_fallback(struct timer_list *t)
>         struct amdgpu_ring *ring = from_timer(ring, t,
>                                               fence_drv.fallback_timer);
>
> -       DRM_WARN("Fence fallback timer expired on ring %s\n", ring->name);
> -       amdgpu_fence_process(ring);
> +       if (amdgpu_fence_process(ring))
> +               DRM_WARN("Fence fallback timer expired on ring %s\n", ring->name);
>  }
>
>  /**
> diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_ring.h b/drivers/gpu/drm/amd/amdgpu/amdgpu_ring.h
> index 9cc2399..4caa301 100644
> --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_ring.h
> +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_ring.h
> @@ -97,7 +97,7 @@ void amdgpu_fence_driver_resume(struct amdgpu_device *adev);
>  int amdgpu_fence_emit(struct amdgpu_ring *ring, struct dma_fence **fence,
>                       unsigned flags);
>  int amdgpu_fence_emit_polling(struct amdgpu_ring *ring, uint32_t *s);
> -void amdgpu_fence_process(struct amdgpu_ring *ring);
> +bool amdgpu_fence_process(struct amdgpu_ring *ring);
>  int amdgpu_fence_wait_empty(struct amdgpu_ring *ring);
>  signed long amdgpu_fence_wait_polling(struct amdgpu_ring *ring,
>                                       uint32_t wait_seq,
> --
> 2.7.4
>
> _______________________________________________
> amd-gfx mailing list
> amd-gfx at lists.freedesktop.org
> https://lists.freedesktop.org/mailman/listinfo/amd-gfx